Comment by ☕️ Morgan

Re: "Beginner tips for beautiful diffs?"

In: s/bash

vimdiff sounds like the same UI concept as kdiff3, good to know :) thanks.

☕️ Morgan

2024-04-27 · 2 years ago

Original Post

🌒 s/bash

🚀 lanterm:

Beginner tips for beautiful diffs? — I largely prefer command line tools, but when it comes to handling merge conflicts I find command line diff tools confusing (e.g. I'm in vimdiff and I've got these panes open - which is which?) and always end up either using a GUI git client like sublime merge to visualize the diff or dive into the file with conflicts and resolve them manually. Also, there are times when I wish to compare two files or strings. Sometimes I just make some dummy git activity to...

💬 5 comments · 1 like · 2024-04-23 · 2 years ago