This article covers Vimdiff Cheat Sheet & Visual Code Merging Guide, originally published as a secure GitHub Gist snippet. vimdiff cheat sheet# ##git mergetool In the middle file (future merged file), you can navigate between conflicts with ]c and [c. Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and … ... read more »