Advertisement
rnekesa

Untitled

Jun 12th, 2018
432
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.59 KB | None | 0 0
  1. JULIE@JULIE-PC MINGW64 ~/openmrs-distro-referenceapplication1 (2.8.X)
  2. $ git checkout 2.8.X
  3. warning: refname '2.8.X' is ambiguous.
  4. Already on '2.8.X'
  5. M package/pom.xml
  6. Your branch and 'origin/2.8.0' have diverged,
  7. and have 1 and 3 different commits each, respectively.
  8. (use "git pull" to merge the remote branch into yours)
  9.  
  10. JULIE@JULIE-PC MINGW64 ~/openmrs-distro-referenceapplication1 (2.8.X)
  11. $ git pull
  12. Enter passphrase for key '/c/Users/JULIE/.ssh/id_rsa':
  13. error: Your local changes to the following files would be overwritten by merge:
  14. package/pom.xml
  15. Please commit your changes or stash them before you merge.
  16. Aborting
  17.  
  18. JULIE@JULIE-PC MINGW64 ~/openmrs-distro-referenceapplication1 (2.8.X)
  19. $ git commit
  20. On branch 2.8.X
  21. Your branch and 'origin/2.8.0' have diverged,
  22. and have 1 and 3 different commits each, respectively.
  23. (use "git pull" to merge the remote branch into yours)
  24.  
  25. Changes not staged for commit:
  26. modified: package/pom.xml
  27.  
  28. no changes added to commit
  29.  
  30. JULIE@JULIE-PC MINGW64 ~/openmrs-distro-referenceapplication1 (2.8.X)
  31. $ git add .;
  32.  
  33. JULIE@JULIE-PC MINGW64 ~/openmrs-distro-referenceapplication1 (2.8.X)
  34. $ git commit -m " package/pom.xml ";
  35. [2.8.X ab87802] package/pom.xml
  36. 1 file changed, 1 insertion(+), 1 deletion(-)
  37.  
  38. JULIE@JULIE-PC MINGW64 ~/openmrs-distro-referenceapplication1 (2.8.X)
  39. $ git push origin 2.8.X;
  40. error: src refspec 2.8.X matches more than one.
  41. error: failed to push some refs to 'git@github.com:jwnasambu/openmrs-distro-referenceapplication.git'
  42.  
  43. JULIE@JULIE-PC MINGW64 ~/openmrs-distro-referenceapplication1 (2.8.X)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement