The office during the day has become the last place people want to be when then really want to get work done.
Offices have become interruption factories: it's just one interruption after
Arsen Semenov arsperger
mattratleph
/ vimdiff.md
Last active
May 9, 2024 03:11
— forked from roothybrid7/vimdiff_cheet.md
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 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)