Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Cliff@Cliff-PC MINGW64 ~/Desktop/New folder (2)/openmrs-core (2.4.x)
- $ git checkout master
- Switched to branch 'master'
- Your branch is up to date with 'origin/master'.
- Cliff@Cliff-PC MINGW64 ~/Desktop/New folder (2)/openmrs-core (master)
- $ git pull --rebase upstream master
- remote: Enumerating objects: 3, done.
- remote: Counting objects: 100% (3/3), done.
- remote: Compressing objects: 100% (3/3), done.
- remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
- Unpacking objects: 100% (3/3), done.
- From https://github.com/openmrs/openmrs-core
- * branch master -> FETCH_HEAD
- 260dcf503..ee1d74f3c master -> upstream/master
- Updating 260dcf503..ee1d74f3c
- Fast-forward
- pom.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
- Current branch master is up to date.
- Cliff@Cliff-PC MINGW64 ~/Desktop/New folder (2)/openmrs-core (master)
- $ git checkout 2.4.x
- Switched to branch '2.4.x'
- Your branch and 'origin/2.4.x' have diverged,
- and have 36 and 8 different commits each, respectively.
- (use "git pull" to merge the remote branch into yours)
- Cliff@Cliff-PC MINGW64 ~/Desktop/New folder (2)/openmrs-core (2.4.x)
- $ git pull --rebase upstream master
- From https://github.com/openmrs/openmrs-core
- * branch master -> FETCH_HEAD
- First, rewinding head to replay your work on top of it...
- Applying: backport: TRUNK-4830: Use 1.9.x as default snapshot version (#3608)
- Applying: [maven-release-plugin] prepare release 2.4.0-alpha.2
- Applying: [maven-release-plugin] prepare for next development iteration
- Applying: 2.4.x new changes
- Cliff@Cliff-PC MINGW64 ~/Desktop/New folder (2)/openmrs-core (2.4.x)
- $ git pull --rebase upstream master
- From https://github.com/openmrs/openmrs-core
- * branch master -> FETCH_HEAD
- Current branch 2.4.x is up to date.
- Cliff@Cliff-PC MINGW64 ~/Desktop/New folder (2)/openmrs-core (2.4.x)
- $ git apply --ignore-whitespace databaseupdater.patch.txt
- error: can't open patch 'databaseupdater.patch.txt': No such file or directory
- Cliff@Cliff-PC MINGW64 ~/Desktop/New folder (2)/openmrs-core (2.4.x)
- $
Add Comment
Please, Sign In to add comment