Vim-conflicted Alternatives

Similar projects and alternatives to vim-conflicted

• tmux

  208 33,008 8.3 C vim-conflicted VS tmux

  tmux source code

  

• vim-fugitive

  114 19,291 8.1 Vim Script vim-conflicted VS vim-fugitive

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

• InfluxDB

  www.influxdata.com featured

  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.

  

• gitsigns.nvim

  80 4,388 9.2 Lua vim-conflicted VS gitsigns.nvim

  Git integration for buffers

• diffview.nvim

  61 3,363 6.1 Lua vim-conflicted VS diffview.nvim

  Single tabpage interface for easily cycling through diffs for all modified files for any git rev.

• vim-floaterm

  59 2,388 5.9 Vim Script vim-conflicted VS vim-floaterm

  :computer: Terminal manager for (neo)vim

• vim-unimpaired

  52 3,232 0.0 Vim Script vim-conflicted VS vim-unimpaired

  unimpaired.vim: Pairs of handy bracket mappings

• diffconflicts

  16 380 2.4 Vim Script vim-conflicted VS diffconflicts

  A better Vimdiff Git mergetool

• SaaSHub

  www.saashub.com featured

  SaaSHub - Software Alternatives and Reviews. SaaSHub helps you find the best software and product alternatives

  

• git-conflict.nvim

  10 783 7.4 Lua vim-conflicted VS git-conflict.nvim

  A plugin to visualise and resolve merge conflicts in neovim

• vim-mergetool

  6 281 0.0 Vim Script vim-conflicted VS vim-mergetool

  :cake: Efficient way of using Vim as a Git mergetool

• diff-therapy.nvim

  1 78 0.0 Lua vim-conflicted VS diff-therapy.nvim

  resolve those conflicts and have a happy relationship with git

• conflict3

  1 9 10.0 Vim Script vim-conflicted VS conflict3

  Vim plugin for highlighting and resolving diff3-style conflicts