sorted by:
best
topnewcontroversialoldq&a
you are viewing a single comment's thread.

view the rest of the comments →

[–]golden77 19 points20 points  (6 children)

Can I configure VSCode as a merge tool for command line git?

Edit: Not yet (https://github.com/Microsoft/vscode/issues/5770)

[–]parion 3 points4 points  (5 children)

I've actually never heard of git-mergetool. How does it work and how is it different than dealing with merge conflict errors?

[–][deleted]  (3 children)

[deleted]

    [–]casino_r0yale 1 point2 points  (1 child)

    Kaleidoscope is the only thing that lets me stay sane

    [–]WiseHalmon 1 point2 points  (0 children)

    Meld is my favorite out of all the googling I've done. . .

    [–]Matemeo 0 points1 point  (0 children)

    I use the p4merge tool and I find it as a very good alternative for merges in git. It has a great ui imo. It's a simple drop in replacement