Diff and Merge Tools
Discussions focus on recommendations and comparisons of various diff viewers and merge tools like difftastic, Meld, Delta, Sublime Merge, and others for improving git and version control workflows.
Activity Over Time
Top Contributors
Keywords
Sample Comments
There is this amazing tool called difftastic. I've been using it for years with git and it works like a charm. [1] [2][1] https://news.ycombinator.com/item?id=27768861[2] https://github.com/Wilfred/difftastic
Use meld, or any one of the many other excellent visual diff viewers.
Still no built-in diff tool and conflict merger?
Have you tried p4merge? It's usually one of the first tools I install.
Things like difftastic work perfectly fine with githttps://difftastic.wilfred.me.uk/
Check out Sublime Merge, from the creators of Sublime Text: https://www.sublimemerge.com
I use lazygit for that. But any diff tool you like will work.
Again a tooling limitation. Use github or horizontal diffs.
If you use git diffs frequently, I recommend setting up delta: https://github.com/dandavison/delta
Does a diffing tool maybe satisfy your requirements? I personally use Meld but there's lots of them out there.