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,461,488
Community Members
 
Community Events
176
Community Groups

How do I get out of this state?

I'm getting "you have not concluded your merge (Merge head exists)" when I try to pull or push in this state of the repository. I tried other things as well, and always get this message

What should I do?

Screenshot 2019-01-06 22.35.55.png

1 answer

1 accepted

0 votes
Answer accepted
Ana Retamal Atlassian Team Jan 08, 2019

Hi Michael!

This is not an issue with Sourcetree, but with Git. I'd recommend you to use the terminal for this and check the status of your repository (git status). If there are any conflicts you'll need to resolve them and after that add them (git add). If there aren't any unmerged files then you can do git commit.

Maybe these other responses from the Community will be useful too:

Hope that helps!

Ana

That was easy. Just going to the command line and typing 'git commit' was all that was necessary.

Ana Retamal Atlassian Team Jan 09, 2019

Happy to hear that :) 

Have a good day!

Suggest an answer

Log in or Sign up to answer
TAGS

Atlassian Community Events