Poll: how do you jump to Git conflict markers?

This page summarizes the projects mentioned and recommended in the original post on /r/neovim

CodeRabbit: AI Code Reviews for Developers
Revolutionize your code reviews with AI. CodeRabbit offers PR summaries, code walkthroughs, 1-click suggestions, and AST-based analysis. Boost productivity and code quality across all major languages with each PR.
coderabbit.ai
featured
SaaSHub - Software Alternatives and Reviews
SaaSHub helps you find the best software and product alternatives
www.saashub.com
featured
  1. diffview.nvim

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

    Please explain. I can see on https://github.com/sindrets/diffview.nvim that you can use Tab to cycle through changed files. And then you're right at the conflicts or how does it work?

  2. CodeRabbit

    CodeRabbit: AI Code Reviews for Developers. Revolutionize your code reviews with AI. CodeRabbit offers PR summaries, code walkthroughs, 1-click suggestions, and AST-based analysis. Boost productivity and code quality across all major languages with each PR.

    CodeRabbit logo
  3. git-conflict.nvim

    A plugin to visualise and resolve merge conflicts in neovim

    I use akinsho/git-conflict and it does its job: minimal and efficient.

  4. lazygit.nvim

    Plugin for calling lazygit from within neovim.

    So I use https://github.com/kdheepak/lazygit.nvim All of my git workflow is done in lazygit gg opens the float and away I go

  5. diffconflicts

    A better Vimdiff Git mergetool

    https://github.com/whiteinge/diffconflicts as a merge tool

  6. vim-fugitive

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

    vim-fugitve and it's great.

  7. SaaSHub

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

    SaaSHub logo
NOTE: The number of mentions on this list indicates mentions on common posts plus user suggested alternatives. Hence, a higher number means a more popular project.

Suggest a related project

Related posts

  • I use the default file browser in vim (netrw). I know there are plugins that a lot of people like. Should I switch?

    9 projects | /r/vim | 29 Jun 2023
  • Using Git From Vim

    8 projects | dev.to | 17 Sep 2021
  • Why I prefer Neovim over VSCode

    4 projects | /r/neovim | 12 Sep 2021
  • Git workflow with understanding file history (fugitive.vim, gv.vim, vim-flog, .. others?)

    3 projects | /r/vim | 15 Apr 2021
  • Vim mergetool – Reimagined Git merge workflow

    1 project | news.ycombinator.com | 17 Jan 2025