Conflict-marker.vim Alternatives

Similar projects and alternatives to conflict-marker.vim

• lazygit

  145 45,525 9.8 Go conflict-marker.vim VS lazygit

  simple terminal UI for git commands

• vim-fugitive

  114 19,233 8.2 Vim Script conflict-marker.vim VS vim-fugitive

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

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

  

• gitsigns.nvim

  80 4,357 9.2 Lua conflict-marker.vim VS gitsigns.nvim

  Git integration for buffers

• diffview.nvim

  61 3,344 6.9 Lua conflict-marker.vim VS diffview.nvim

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

• tig

  59 12,151 6.5 C conflict-marker.vim VS tig

  Text-mode interface for git

• vim-floaterm

  59 2,381 5.6 Vim Script conflict-marker.vim VS vim-floaterm

  :computer: Terminal manager for (neo)vim

• neogit

  54 3,264 9.9 Lua conflict-marker.vim VS neogit

  An interactive and powerful Git interface for Neovim, inspired by Magit

  

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

  

• neovim-remote

  38 1,668 0.0 Python conflict-marker.vim VS neovim-remote

  :ok_hand: Support for --remote and friends.

• vim-gitgutter

  32 8,276 7.7 Vim Script conflict-marker.vim VS vim-gitgutter

  A Vim plugin which shows git diff markers in the sign column and stages/previews/undoes hunks and partial hunks.

• diffconflicts

  16 380 2.4 Vim Script conflict-marker.vim VS diffconflicts

  A better Vimdiff Git mergetool

• git-conflict.nvim

  10 770 7.4 Lua conflict-marker.vim VS git-conflict.nvim

  A plugin to visualise and resolve merge conflicts in neovim

• lazygit.nvim

  13 1,149 5.4 Lua conflict-marker.vim VS lazygit.nvim

  Plugin for calling lazygit from within neovim.

• vim-mergetool

  6 281 0.0 Vim Script conflict-marker.vim VS vim-mergetool

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

• auto-git-diff

  2 106 10.0 Vim Script conflict-marker.vim VS auto-git-diff

  A vim plugin which shows git diff for Git Rebase Interactive

• tig-explorer.vim

  5 201 0.0 Vim Script conflict-marker.vim VS tig-explorer.vim

  Vim plugin to use Tig as a git client. Seamless switching between vim and Tig with opening in the same buffer.

• committia.vim

  8 709 2.9 Vim Script conflict-marker.vim VS committia.vim

  A Vim plugin for more pleasant editing on commit messages

• vim-gh-line

  6 404 2.9 Vim Script conflict-marker.vim VS vim-gh-line

  vim plugin that open the link of current line on github

• vim-merginal

  3 275 6.0 Vim Script conflict-marker.vim VS vim-merginal

  Fugitive extension to manage and merge Git branches

• agitator.nvim

  2 58 5.5 Lua conflict-marker.vim VS agitator.nvim

• SaaSHub

  www.saashub.com sponsored

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