miniblog.

← Back to all posts
Jan 22, 2018 at 20:25
Git is rather timid with merge conflicts. If you change two adjacent lines, it assumes they conflict! https://softwareengineering.stackexchange.com/questions/194788/why-doesnt-git-merge-adjacent-lines-without-conflict In my experience they don't, and it causes problems when library imports change at the top of the file. Interestingly, Subversion happily merges.

Related Posts

Aug 16, 2023 at 06:45
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
PhotoPhotoPhoto
Release 0.50.0 · Wilfred/difftastic
Release 0.50.0 · Wilfred/difftastic
Difftastic is a structural diff tool that understands syntax. See the manual to get started, and the changelog for historical changes. Conflicts Difftastic now supports parsing files with conflict ...
Aug 14, 2023 at 05:52
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.
PhotoPhoto
Sep 8, 2020 at 01:27
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.