I Read 9,000 Lines of a Stranger's Mergetool

📰 Dev.to · Wes

Every developer has a merge conflict horror story. Mine usually starts with vimdiff opening four...

Published 27 Feb 2026