Dealing with merge conflicts is an important skill that I've seen many experienced developers struggle with.
My experience might be biased from helping teams migrate from svn to git, but I've seen problems with all VCS.
miniblog.
Related Posts
I've released difftastic 0.50!
In this release:
* Merge conflicts! Difftastic now understands <<<<<<< syntax and shows a syntactic diff of the underlying files.
* Updated parsers for Elixir, Erlang, Go, Kotlin and Racket
* Various styling quality-of-life improvements
I'm experimenting with <<<<<<< merge conflict markers in difftastic: recreate the conflicting files and then diff them.
What do you think? Merge conflicts are confusing even at the best of times, but maybe difftastic's UI can help a little.
It's amazing that merging work at all.
It's a dumb textual transform that provides no guarantees that the code is even syntactically valid, let alone correct. The problem feels AI-complete.
I've seen bad resolutions of merge conflicts way more than bad automatic merges though.