News for hackers. Stuff that matters.
Re:Ask HN: What is your favorite tool to resolve Git merge c... by ZeroGravitas on Wednesday July 12, 2023 @09:26AM (#36694191)
There's a big long nerdy blog post about it (where I learned this technique) but basically many tools will throw away information and take you back to the start of a tricky merge. With the right settings, you can leave all the easy bits done and see exactly what caused the problem.

I think the guy was campaigning to make it the default so it may be in some tools now.

I'll see if I can Google it up.

edit, think this is it:

https://www.eseth.org/2020/mergetools.html

Re:Ask HN: What is your favorite tool to resolve Git merge c... by ctenb on Wednesday July 12, 2023 @11:36AM (#36696144)
Thanks for the link. Looks like a thorough article. I'll defs give it a read.