Why does Sourcetree Git detach branch on merge conflict?

Scott Downie November 6, 2014

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

0 votes
Scott Downie November 6, 2014

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

0 votes
Seth
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
November 6, 2014

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

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events