Guest User

Untitled

a guest
Oct 26th, 2020
87
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.09 KB | None | 0 0
  1.  
  2. Cliff@Cliff-PC MINGW64 ~/Desktop/New folder (2)/openmrs-core (2.4.x)
  3. $ git checkout master
  4. Switched to branch 'master'
  5. Your branch is up to date with 'origin/master'.
  6.  
  7. Cliff@Cliff-PC MINGW64 ~/Desktop/New folder (2)/openmrs-core (master)
  8. $ git pull --rebase upstream master
  9. remote: Enumerating objects: 3, done.
  10. remote: Counting objects: 100% (3/3), done.
  11. remote: Compressing objects: 100% (3/3), done.
  12. remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
  13. Unpacking objects: 100% (3/3), done.
  14. From https://github.com/openmrs/openmrs-core
  15. * branch master -> FETCH_HEAD
  16. 260dcf503..ee1d74f3c master -> upstream/master
  17. Updating 260dcf503..ee1d74f3c
  18. Fast-forward
  19. pom.xml | 2 +-
  20. 1 file changed, 1 insertion(+), 1 deletion(-)
  21. Current branch master is up to date.
  22.  
  23. Cliff@Cliff-PC MINGW64 ~/Desktop/New folder (2)/openmrs-core (master)
  24. $ git checkout 2.4.x
  25. Switched to branch '2.4.x'
  26. Your branch and 'origin/2.4.x' have diverged,
  27. and have 36 and 8 different commits each, respectively.
  28. (use "git pull" to merge the remote branch into yours)
  29.  
  30. Cliff@Cliff-PC MINGW64 ~/Desktop/New folder (2)/openmrs-core (2.4.x)
  31. $ git pull --rebase upstream master
  32. From https://github.com/openmrs/openmrs-core
  33. * branch master -> FETCH_HEAD
  34. First, rewinding head to replay your work on top of it...
  35. Applying: backport: TRUNK-4830: Use 1.9.x as default snapshot version (#3608)
  36. Applying: [maven-release-plugin] prepare release 2.4.0-alpha.2
  37. Applying: [maven-release-plugin] prepare for next development iteration
  38. Applying: 2.4.x new changes
  39.  
  40. Cliff@Cliff-PC MINGW64 ~/Desktop/New folder (2)/openmrs-core (2.4.x)
  41. $ git pull --rebase upstream master
  42. From https://github.com/openmrs/openmrs-core
  43. * branch master -> FETCH_HEAD
  44. Current branch 2.4.x is up to date.
  45.  
  46. Cliff@Cliff-PC MINGW64 ~/Desktop/New folder (2)/openmrs-core (2.4.x)
  47. $ git apply --ignore-whitespace databaseupdater.patch.txt
  48. error: can't open patch 'databaseupdater.patch.txt': No such file or directory
  49.  
  50. Cliff@Cliff-PC MINGW64 ~/Desktop/New folder (2)/openmrs-core (2.4.x)
  51. $
  52.  
Add Comment
Please, Sign In to add comment