I did that in my feature branch which resulted in one PUSH and one PULL pending and I fail both of them. For example, trying to PUSH to the repository I get the following response:
git -c diff.mnemonicprefix=false -c core.quotepath=false push -v --tags origin EoD2_cleanup:EoD2_cleanup Pushing to D:/Meir/Dropbox/git_repositories/ML.git sh: warning: setlocale: LC_ALL: cannot change locale (en): No such file or directory To D:/Meir/Dropbox/git_repositories/ML.git ! [rejected] EoD2_cleanup -> EoD2_cleanup (non-fast-forward) error: failed to push some refs to 'D:/Meir/Dropbox/git_repositories/ML.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
How do I get out of this mess?, Pleeeease...
@seth: For no apparent reason, I was successful in PULLing and then successful in PUSHing. Why it was that way is a mystery for me. (I remind myself of a certain computer challenged person in our household ). But I learned my lesson: NO AMEND, EVER! (learned it the hard way, but is there ever an easy way???) Thanks, Meir.
There's nothing wrong with amending and I do it all the time!
If you've already pushed your changes to your remote and then decide you want to change them, amend the commit like you have done. Then in terminal/cmd type in
git push -f
git push remotename branchname -f
Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot