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

Catch 22: Push before pulling, pull before pushing

I tried to commit a file in SourceTree not knowing one of my colleagues had recently committed an update to the same file (and others). So now I've got an incomplete Push and an incomplete Pull. When I try to do the Push I get: 

error: failed to push some refs to 'https://bitbucket.org/eClinical/analytics-3.0/src/master/'
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.

When I try to do the Pull I get:

error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.

I don't care if my changes get crushed because my colleague basically made the same change. I just want to get my environment  working "normally" again.

Thanks

stboof.png

 

1 answer

1 accepted

0 votes
Answer accepted

Hello! Any of the following will work:

  • Hit the "Terminal" button and type: git reset --merge
  • Switch to another branch, then delete 'master' (hit the "force delete"), then checkout master again under remotes
  • Or, under the "yourproject/.git" folder, delete the MERGE_HEAD file

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

4,895 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