Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- JULIE@JULIE-PC MINGW64 ~/openmrs-distro-referenceapplication1 (2.8.X)
- $ git checkout 2.8.X
- warning: refname '2.8.X' is ambiguous.
- Already on '2.8.X'
- M package/pom.xml
- Your branch and 'origin/2.8.0' have diverged,
- and have 1 and 3 different commits each, respectively.
- (use "git pull" to merge the remote branch into yours)
- JULIE@JULIE-PC MINGW64 ~/openmrs-distro-referenceapplication1 (2.8.X)
- $ git pull
- Enter passphrase for key '/c/Users/JULIE/.ssh/id_rsa':
- error: Your local changes to the following files would be overwritten by merge:
- package/pom.xml
- Please commit your changes or stash them before you merge.
- Aborting
- JULIE@JULIE-PC MINGW64 ~/openmrs-distro-referenceapplication1 (2.8.X)
- $ git commit
- On branch 2.8.X
- Your branch and 'origin/2.8.0' have diverged,
- and have 1 and 3 different commits each, respectively.
- (use "git pull" to merge the remote branch into yours)
- Changes not staged for commit:
- modified: package/pom.xml
- no changes added to commit
- JULIE@JULIE-PC MINGW64 ~/openmrs-distro-referenceapplication1 (2.8.X)
- $ git add .;
- JULIE@JULIE-PC MINGW64 ~/openmrs-distro-referenceapplication1 (2.8.X)
- $ git commit -m " package/pom.xml ";
- [2.8.X ab87802] package/pom.xml
- 1 file changed, 1 insertion(+), 1 deletion(-)
- JULIE@JULIE-PC MINGW64 ~/openmrs-distro-referenceapplication1 (2.8.X)
- $ git push origin 2.8.X;
- error: src refspec 2.8.X matches more than one.
- error: failed to push some refs to 'git@github.com:jwnasambu/openmrs-distro-referenceapplication.git'
- JULIE@JULIE-PC MINGW64 ~/openmrs-distro-referenceapplication1 (2.8.X)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement