You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
Next: Root
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
The Atlassian Community can help you and your team get more value out of Atlassian products and practices.
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?
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.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.