git ux sucks

news at 11

the core idea might be ok, heaven knows it has won out, but the ux kills me every other day.

https://joseph-fox.co.uk/tech/git-ours-theirs-explained