vimdiff cheat sheet
In the middle file (future merged file), you can navigate between conflicts with
Choose which version you want to keep with
:diffget LO or
:diffget RE (the
RE are unique identifiers for the target/master copy and the merge/branch copy file names).
:diffupdate (to remove leftover spacing issues) :only (once you’re done reviewing all conflicts, this shows only the middle/merged file)