dotfiles VS vim-mergetool

diffconflicts [dc] lets you resolve diffs as a two way diff between what's in the conflict markers instead of including the resolved parts in the diff. It opens the diff in vim but could be adapted for other editors. Verbose explanation: https://github.com/whiteinge/diffconflicts/blob/master/READM...

The author converted it to a vim plugin with the same name, but I use a different vim plugin implementation [mergetool].

[dc]: https://github.com/whiteinge/dotfiles/blob/master/bin/diffco...

Example: https://github.com/whiteinge/dotfiles/blob/master/bin/devdocs-local

Took me several years of forgetting script names before I finally just made a README of filenames and descriptions that I can search when I forget. I didn't want some complicated organization framework.

I ran a (mostly) vim-tmux-navigator setup for almost a year but ultimately removed it. It was indeed a seamless way to quickly jump between Vim and tmux panes but I felt it enabled learning some sloppy habits on my part.

I added filetype indent off so that indent plugins for the various languages would not automatically execute, and then I set smartindent so that regardless of what kind of file I'm editing it (very!) simply just re-uses the same indent from the previous line. For everything else I just manually ctrl-t/ctrl-d as I type.

I like vim-mergetool for merging in vim. It's inspired by the diffconflicts method (but written in vimscript): Diff the resolved conflicts instead of a three way diff with base. You can also switch to three way with :MergetoolToggleLayout LmR too, but I usually only switch to diffing resolved against theirs or ours.