Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Next challenges

Recent achievements

Recognition

  • Give kudos
  • My kudos

Leaderboard

  • Global

Trophy case

Kudos (beta program)

Kudos logo

You've been invited into the Kudos (beta program) private group. Chat with others in the program, or give feedback to Atlassian.

View group

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Ammended a commit AFTER it was merged into 'master'

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...

Meir

3 answers

Well, you can't push until you've pulled. What is the Pull error?

@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 :smile:). 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

or

git push remotename branchname -f

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

5,289 views 0 12
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you