Integrating Git and (Neo)Vim: LazyGit + Fugitive + MergeTool for maxiumum efficiency [Showcase]

• meld

  38 17 4.3 Python

  Meld (by noamraph)

So, I use Meld for viewing complex diffs (:silent !meld . &). For interactivity, of course, I use the terminal and Vim, such as lazygit and tig, and fugative and gitgutter (or equivalents).

• vim-mergetool

  2 1 10.0 Vim Script

  Better vim-based mergetool (by idbrii)

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.

• InfluxDB

  www.influxdata.com sponsored

  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.

  

• diffconflicts

  16 380 2.4 Vim Script

  A better Vimdiff Git mergetool

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.

Suggest a related project