Catch 22: Push before pulling, pull before pushing

[Steven Taschereau]

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

[Mike Corsaro · Accepted solution]

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