Our great sponsors
-
InfluxDB
Power Real-Time Data Analytics at Scale. Get real-time insights from all types of time series data with InfluxDB. Ingest, query, and analyze billions of data points in real-time with unbounded cardinality.
I don't use multi cursors, never had the need for it. For complicated editing I use macros instead. But maybe https://github.com/mg979/vim-visual-multi is what you're looking for?
Fugitive is my weapon of choice. There's a nice series on Vim Casts about it too.
I navigate through changes with ]c and [c, get commits from another diff with do (same as :diffget, mnemonics is 'diff obtain') or put a change into another diff with dp. This usually works best with 2-way diffs, because to resolve conflicts using a three-way diff I'd have to pass a count to do or dp, which is less convenient. I use diffconflicts to do this, there is a plugin for Vim.