Git is my buddy: Effective Git as a solo developer

Re:Git is my buddy: Effective Git as a solo developer by dotancohen on Tuesday February 23, 2021 @05:49PM (#26244048)

Regarding diff tools: suggestions welcome. I've used VIM's three-way diffs, and would prefer to stay in the CLI. But the Jetbrains IDEs come with a great GUI diff tool for Git merge conflicts. I'd love to find something comparable on the CLI.

[ Parent | on HN ]

Re:Git is my buddy: Effective Git as a solo developer by CalChris on Tuesday February 23, 2021 @08:24PM (#26245464)

I use kdiff3 but I only want a visual diff. I'm not using it as a merge tool. VS Code has great git support and great diff support. If it only had better (or rather, more accurate) vim support I'd be there but every time I try, I head back to standard vim with something like VimR. It's been six months and I should try again again.

[ Parent | on HN ]

Re:Git is my buddy: Effective Git as a solo developer by dotancohen on Sunday February 28, 2021 @03:50PM (#26296946)

Thank you.

[ Parent | on HN ]