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?
