Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
0 / 0 points
Next:
badges earned

Your Points Tracker
Challenges
Leaderboard
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Recognition
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Kudos
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

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

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
Community showcase
Published in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

3,417 views 4 5
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