Which tools do you use for Git Conflicts?

• vim-fugitive

  114 19,233 8.2 Vim Script

  fugitive.vim: A Git wrapper so awesome, it should be illegal

I use https://github.com/lewis6991/gitsigns.nvim for checking changes in the code, and use https://github.com/tpope/vim-fugitive to run git commands (add, commit, push, etc) without leaving neovim.

• git-conflict.nvim

  10 770 7.4 Lua

  A plugin to visualise and resolve merge conflicts in neovim

Maybe give https://github.com/akinsho/git-conflict.nvim a try, another alternative could be fugitive by tpope iirc.

• WorkOS

  workos.com sponsored

  The modern identity platform for B2B SaaS. The APIs are flexible and easy-to-use, supporting authentication, user identity, and complex enterprise features like SSO and SCIM provisioning.

  

• gitsigns.nvim

  80 4,357 9.2 Lua

  Git integration for buffers

I use https://github.com/lewis6991/gitsigns.nvim for checking changes in the code, and use https://github.com/tpope/vim-fugitive to run git commands (add, commit, push, etc) without leaving neovim.

• diffconflicts

  16 380 2.4 Vim Script

  A better Vimdiff Git mergetool

• vim-unimpaired

  52 3,222 0.0 Vim Script

  unimpaired.vim: Pairs of handy bracket mappings

I use https://github.com/tpope/vim-unimpaired as it creates a mapping to jump to the next marker.

• vim-floaterm

  59 2,381 5.6 Vim Script

  :computer: Terminal manager for (neo)vim

Leave the editor? I'im using Floaterm to quick access to shell. Beside, I have Tmux covered too

• tmux

  207 32,923 8.3 C

  tmux source code

  

Leave the editor? I'im using Floaterm to quick access to shell. Beside, I have Tmux covered too

• 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.

  

• diff-therapy.nvim

  1 78 0.0 Lua

  resolve those conflicts and have a happy relationship with git

u/I_AM_NERD is working on one which is looking really promising: https://github.com/tjdevries/diff-therapy.nvim

• vim-conflicted

  2 270 0.0 Vim Script

  Easy git merge conflict resolution in Vim

I have been using https://github.com/christoomey/vim-conflicted for some time now.

• conflict3

  1 9 10.0 Vim Script

  Vim plugin for highlighting and resolving diff3-style conflicts

I use https://github.com/mkotha/conflict3 to highlight changes in conflict markers.

Suggest a related project