Back

merge conflict follow up: if you prefer to edit the weird text file by hand instead of using a dedicated merge conflict tool, why is that?

@b0rk@social.jvns.ca voted other -> I'd never heard of a merge conflict tool until your first poll. I haven't looked it up, but I'm not really sure what problem it would solve - I'd still have fix the conflict, right?

@jackie thanks that reminds me i want to ask people what their favourite merge conflict tools are!

@b0rk @jackie I usually just use vim, but for messy cases I will cherry pick commits and use meld.

@c0dec0dec0de @b0rk @jackie I actually do use vimdiff, but haven't ever tried it for three way merge.

@ryanc @b0rk @jackie but those are the ones I need meld for.

@c0dec0dec0de @b0rk @jackie Exactly my problem, lol.

@ryanc “But, Doctor, I am great remote-developer Vimuser!” @b0rk @jackie