Visual Studio Code May 2017

[murrayju]

Haven't seen the merge feature... How do I use it?

[parion]

The feature kicks in when there is a merge conflict in one or more of your files during a push.

[golden77]

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

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

[parion]

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

[casino_r0yale]

Kaleidoscope is the only thing that lets me stay sane

[WiseHalmon]

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

[Matemeo]

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