Why does Sourcetree Git detach branch on merge conflict?

One member of my team has a problem that none of the rest of the team has. It is as follows:

  • They commit some work to local develop (ok)
  • They pull from remote develop (ok)
  • They get a merge conflict (ok)
  • They end up on a detached branch (i.e. none of their local branches are selected) and cannot resolve the conflict and commit back to develop. Attempting to change back to develop warns that a rebase is in progress (Not ok)

I assume it must be a setting or config that causes this as none of the rest of the team, on the same version and hardware, experience this. What the rest of us find that after a merge conflict we remain on the same local branch. Has anyone come across this before and know how to resolve it?

2 answers

Never had that happen to me. Is he using the latest version of SourceTree? Is he using Embedded Git or System Git (installed separately)?

He's using the folllowing: - SourceTree v 2.0.1 - Embedded Git v

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Oct 23, 2018 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...

966 views 4 2
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you