Comment by ๐Ÿ™ norayr

Re: "Beginner tips for beautiful diffs?"

In: s/bash

and i prefer tkdiff. (:

๐Ÿ™ norayr

2024-04-26 ยท 2 years ago

1 Later Comment

โ˜•๏ธ Morgan ยท 2024-04-27 at 04:35:

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

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