git-conflict.nvim VS neogit

Compare git-conflict.nvim vs neogit and see what are their differences.

git-conflict.nvim

A plugin to visualise and resolve merge conflicts in neovim (by akinsho)

neogit

An interactive and powerful Git interface for Neovim, inspired by Magit (by NeogitOrg)
Our great sponsors
  • InfluxDB - Power Real-Time Data Analytics at Scale
  • WorkOS - The modern identity platform for B2B SaaS
  • SaaSHub - Software Alternatives and Reviews
git-conflict.nvim neogit
10 54
743 3,134
- 9.0%
7.4 9.9
2 months ago 4 days ago
Lua Lua
- MIT License
The number of mentions indicates the total number of mentions that we've tracked plus the number of user suggested alternatives.
Stars - the number of stars that a project has on GitHub. Growth - month over month growth in stars.
Activity is a relative number indicating how actively a project is being developed. Recent commits have higher weight than older ones.
For example, an activity of 9.0 indicates that a project is amongst the top 10% of the most actively developed projects that we are tracking.

git-conflict.nvim

Posts with mentions or reviews of git-conflict.nvim. We have used some of these posts to build our list of alternatives and similar projects. The last one was on 2023-01-01.

neogit

Posts with mentions or reviews of neogit. We have used some of these posts to build our list of alternatives and similar projects. The last one was on 2024-03-11.
  • Neovim: creating keymaps in lua
    4 projects | dev.to | 11 Mar 2024
    I would use this feature of lazy.nvim in a plugin that I rarely need. Something neogit for example. I can spend hours coding without using it. In that particular case I think is nice to have the option to load it when I actually call it.
  • GitUI
    5 projects | news.ycombinator.com | 7 Jan 2024
    This looks very much like the Noevim plugin I began using about a month ago: neogit[0].

    The keybindings were a bit rough, and it took me about an hour of use before I was really comfortable with the overall workflow. Once I was, though, I’ve found it to be much faster than my previous workflow (suspending neovim and using git directly in the shell).

    0: https://github.com/NeogitOrg/neogit

  • Massive Update to Neogit and New Home!
    2 projects | /r/neovim | 13 Jul 2023
    I'm excited to announce an absolutely massive addition to https://github.com/NeogitOrg/neogit/ following a move to a new organisation on github, NeogitOrg!
    2 projects | /r/neovim | 13 Jul 2023
  • What IDEA or Vscode feature/function you want to have in neovim eco-system?
    16 projects | /r/neovim | 28 Jun 2023
    This is what I use for general git interaction and it‘s pretty neat: neogit. Also integrates diffview
  • Magit
    9 projects | news.ycombinator.com | 26 Jun 2023
    For neovim users, there's a work-in-progress clone, neogit: https://github.com/timUntersberger/neogit/

    Some of my colleagues use emacs/magit, and after seeing how absolutely lovely the workflow is, I've put in a lot of work over the last few months expanding it. You can check out my fork here: https://github.com/ckolkey/neogit/

    One thing I particularly like to tease my emacs' colleagues about is that my magit is faster than theirs thanks to neovim's async capabilities.

  • Your favourite Neovim plugins?
    42 projects | /r/neovim | 21 Jun 2023
  • What do you use for git integration in neovim?
    8 projects | /r/neovim | 6 Jun 2023
    You could use neogit (https://github.com/TimUntersberger/neogit) for basic commands however I have found it's easier / more versatile to just use lazygit in either another tmux tmux window or within neovim itself.
  • Switching from Emacs. My experience
    20 projects | /r/neovim | 24 May 2023
    The only thing I truly miss from Emacs is [Magit](https://magit.vc/) since I still consider it the best git wrapper available. It is just too good. Unfortunately [Neogit](https://github.com/TimUntersberger/neogit) is not quite there yet although I hope it makes it at some point. I didn't like [Fugitive]https://github.com/tpope/vim-fugitive), but I ended up finding a good enough workaround by using [Lazygit](https://github.com/jesseduffield/lazygit) through [Toggleterm](https://github.com/akinsho/toggleterm.nvim).
  • Neovim vs VSCode Neovim - what are the tradeoffs?
    11 projects | /r/neovim | 17 May 2023

What are some alternatives?

When comparing git-conflict.nvim and neogit you can also consider the following projects:

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

lazygit.nvim - Plugin for calling lazygit from within neovim.

octo.nvim - Edit and review GitHub issues and pull requests from the comfort of your favorite editor

lazygit - simple terminal UI for git commands

difftastic - a structural diff that understands syntax 🟥🟩

gitsigns.nvim - Git integration for buffers

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

vim-conflicted - Easy git merge conflict resolution in Vim

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

vim-dadbod-ui - Simple UI for https://github.com/tpope/vim-dadbod

gitui - Blazing 💥 fast terminal-ui for git written in rust 🦀

vgit.nvim - Visual git plugin for Neovim