1. `git rebase -i origin/main` \- Do a rebase and get a conflict 2. `git jump merge`\* \- Open Neovim with conflict places loaded into quickfix...
This is an automated archive made by the Lemmit Bot.

The original was posted on /r/neovim by /u/kaddkaka on 2025-10-28 10:59:30+00:00.

  1. git rebase -i origin/main - Do a rebase and get a conflict
  2. git jump merge* - Open Neovim with conflict places loaded into quickfix list
  3. Solve the first using https://github.com/inkarkat/vim-ConflictMotions
  4. :cnext (mapped with nnoremap <a-j> <cmd>cnext<cr>) to go the next conflict, repeat from 3 until done.

.gitconfig:

core.editor = nvim
[merge]
ff=false
conflictStyle=diff3   # <-- imo makes it much easier to understand the conflict.

Hope this can help someone :)

* git-jump is part of git distribution, look inside the CONTRIB dir of git.

I tried merge.tool=nvimdiff a little bit, but it’s annoying that it goes to every changed place, not just the unresolved conflicts.