[xcjs]

Did they ever get around to three-way merges? That's a must-have if you use Git as a VCS.

[gofreddygo]

I dont know. I Never use three way merges for anything productive.

Always felt three way merges were a great way to melt human brains.

[atVelocet]

Use VSCode for this. Also has three-way merge.