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

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,466,890
Community Members
 
Community Events
176
Community Groups

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

Atlassian Community Events