Oh wow. VS Code has quite nice merge conflict resolution.
1
Replying to @jogbert
Apart from it not being emacs/vim, I have to say that I think vscode is very good.

Nov 23, 2018 ยท 1:54 PM UTC

1
Replying to @dsilverstone
I thought I'd give it a go out of curiosity so I've been using it for a couple of weeks. I even tried vim mode. It's certainly quite impressive, although I still prefer vim for some things.
1
I still use vim and emacs, but I use vscode for JavaScript and Rust development.
1
more replies