For one special repository I'm encountering a strange behavior in Git Extensions. Whenever I merge changes from a remote branch into my local branch, the merged commits appear in my branch and the merge appears as if I merged an orphaned branch.
The merge looks like:
This is the beginning of my history:
In Visual Studio Team Explorer it looks more like I'd expect it to:
Furthermore, on my co-workers machine it looks pretty much the same in Git Extensions as it does on my machine in Visual Studio. It also looks right for other repositories on my machine.
I've already tried to
- Check out the repository again in another folder
- Reinstall GitExtensions
- Delete the folder and then check it out again
- Check Git Extensions settings
But I've not been able to overcome the issue. Is there anything I can do about it? Is there any Git cache I can delete in order to fix it? Any setting in Git Extensions?
If you happen to have "show first parents" turned on, it is known to break the graph this way. It's in the "View" menu.