conflux.nvim

VSCode-like Git conflict resolution for Neovim.

conflux.nvim automatically detects conflict markers in your files and provides color-coded highlights plus quick commands to accept one side, both, or neither — without leaving Neovim.

Features

• Color-coded extmark highlights for <<<<<<<, =======, and >>>>>>> blocks
• Full-line background highlights (VSCode style, using hl_eol)
• diff3 support: ||||||| ancestor sections highlighted in a distinct color
• Buffer-local keymaps set automatically when a conflict file is opened
• Right-aligned keymap hint shown on each <<<<<<< marker line (ours(co) | theirs(ct) | both(cb) | none(cz))
• Resolve-all commands/keymaps to apply one choice to every conflict in the buffer at once — undoable in a single u
• Navigate between conflict blocks with ]c / [c, wrapping around with a count notification
• Project-wide quickfix list of all conflict blocks via cq (:ConfluxQuickfix)
• Live re-scan as you type: conflicts are re-detected on every change and after undo/redo
• Highlights restored after colorscheme changes
• Auto-detach when all conflicts are resolved

Requirements

• Neovim >= 0.10

Installation

lazy.nvim

{
  'muleyuck/conflux.nvim',
  event = 'BufReadPost',
  opts  = {},   -- use defaults; or pass a config table
}

vim-plug

Plug 'muleyuck/conflux.nvim'

Then in your init.lua (or lua block in init.vim):

require('conflux').setup()

packer.nvim

use {
  'muleyuck/conflux.nvim',
  config = function()
    require('conflux').setup()
  end,
}

mini.deps

MiniDeps.add('muleyuck/conflux.nvim')
require('conflux').setup()

pathogen

cd ~/.config/nvim/bundle
git clone https://github.com/muleyuck/conflux.nvim

Then in your init.lua:

require('conflux').setup()

Manual

Add the plugin directory to your runtimepath and call setup():

vim.opt.rtp:prepend('/path/to/conflux.nvim')
require('conflux').setup()

Configuration

All options are optional. Shown below are the defaults:

require('conflux').setup({
  -- Highlight group specs passed directly to nvim_set_hl().
  -- Use { bg = '#rrggbb' } or { link = 'SomeGroup' }.
  highlights = {
    ours             = { bg = '#2b4d2b' },
    ours_marker      = { bg = '#3d6b3d', bold = true },
    ancestor         = { bg = '#4d3d1a' },    -- diff3 only
    ancestor_marker  = { bg = '#6b5a1a', bold = true },
    separator        = { bg = '#3d3d3d', bold = true },
    theirs           = { bg = '#1a2b4d' },
    theirs_marker    = { bg = '#1a3d6b', bold = true },
    keymap_hint      = { fg = '#99bb99' },    -- virtual text hint on <<<<<<< line
    all_keymap_hint  = { fg = '#99aacc' },    -- virtual text hint on >>>>>>> line
  },

  -- Set false to opt out of all plugin-managed keymaps
  default_mappings = true,

  -- Set false to hide the right-aligned keymap hint on each <<<<<<< marker line
  show_keymap_hints = true,

  -- Keys for the default mappings (per-block).
  -- Set any individual key to false to disable only that mapping.
  keymaps = {
    ours   = 'co',
    theirs = 'ct',
    both   = 'cb',
    none   = 'cz',
  },

  -- Keys for resolve-all mappings (apply choice to every conflict in the buffer).
  -- Set any individual key to false to disable only that mapping.
  all_keymaps = {
    ours   = 'cO',
    theirs = 'cT',
    both   = 'cB',
    none   = 'cZ',
  },

  -- Keys for navigation between conflict blocks.
  -- Set any individual key to false to disable only that mapping.
  nav_keymaps = {
    next = ']c',
    prev = '[c',
  },

  -- Keys for the project-wide quickfix list (global keymap, registered at setup time).
  -- Set to false to disable.
  quickfix_keymaps = {
    open = 'cq',
  },
})

Linking to existing highlight groups

require('conflux').setup({
  highlights = {
    ours   = { link = 'DiffAdd' },
    theirs = { link = 'DiffDelete' },
  },
})

Commands

Per-block

Command	Description
:ConfluxOurs	Keep HEAD (ours) changes; discard theirs
:ConfluxTheirs	Keep incoming (theirs) changes; discard ours
:ConfluxBoth	Keep both changes (ours first, then theirs)
:ConfluxNone	Discard both sides entirely

These commands act on the conflict block that contains the cursor.

Resolve all

Command	Description
:ConfluxAllOurs	Keep ours in every conflict block in the buffer
:ConfluxAllTheirs	Keep theirs in every conflict block in the buffer
:ConfluxAllBoth	Keep both in every conflict block in the buffer
:ConfluxAllNone	Discard both in every conflict block in the buffer

Navigation

Command	Description
:ConfluxNext	Jump to the next conflict block
:ConfluxPrev	Jump to the previous conflict block

Default Keymaps

When a conflict file is opened, conflux sets buffer-local normal-mode keymaps:

Per-block

Key	Action
co	Accept ours (:ConfluxOurs)
ct	Accept theirs (:ConfluxTheirs)
cb	Accept both (:ConfluxBoth)
cz	Accept none (:ConfluxNone)

Resolve all

Key	Action
cO	Accept ours in all (:ConfluxAllOurs)
cT	Accept theirs in all (:ConfluxAllTheirs)
cB	Accept both in all (:ConfluxAllBoth)
cZ	Accept none in all (:ConfluxAllNone)

Navigation

Key	Action
]c	Next conflict (:ConfluxNext)
[c	Previous conflict (:ConfluxPrev)

Project quickfix

Key	Action
cq	List all project conflicts (:ConfluxQuickfix)

Note: cq is registered as a global normal-mode keymap when setup() is called. Unlike the other keymaps above (which are buffer-local and scoped to conflict files), cq permanently replaces any existing global mapping for that key. To use a different key, set quickfix_keymaps = { open = '<leader>q' } in your setup() call.

Note: co and ct are two-key sequences that share the c prefix with Vim's built-in change operator. This causes a brief timeout delay when typing c followed by any key. To avoid this, set default_mappings = false and define your own keys — see Keymap registration behaviour below.

Keymap registration behaviour

The table below shows what ends up registered for different configurations:

Configuration	Result
default_mappings = true (default)	All keys in every table are registered
default_mappings = true + keymaps = { none = false }	co, ct, cb registered; cz skipped
default_mappings = true + nav_keymaps = { prev = false }	]c registered; [c skipped
default_mappings = false	Nothing is registered
default_mappings = false + keymaps = { ours = '<leader>co' }	<leader>co registered for ours; all other keys skipped

Example — replace everything with your own keys:

require('conflux').setup({ default_mappings = false })

vim.keymap.set('n', '<leader>co', '<Cmd>ConfluxOurs<CR>')
vim.keymap.set('n', '<leader>ct', '<Cmd>ConfluxTheirs<CR>')
vim.keymap.set('n', '<leader>cb', '<Cmd>ConfluxBoth<CR>')
vim.keymap.set('n', '<leader>cz', '<Cmd>ConfluxNone<CR>')

Highlights

conflux defines these highlight groups (override them after setup()):

Group	Used for
ConfluxOurs	Ours (HEAD) content lines
ConfluxOursMarker	<<<<<<< marker line
ConfluxAncestor	Ancestor content lines (diff3)
ConfluxAncestorMarker	`
ConfluxSeparator	======= separator line
ConfluxTheirs	Theirs (incoming) content lines
ConfluxTheirsMarker	>>>>>>> marker line
ConfluxKeymapHint	Right-aligned keymap hint on <<<<<<< line
ConfluxAllKeymapHint	Right-aligned resolve-all hint on >>>>>>> line

How it works

1. On BufReadPost / BufWritePost, conflux scans the buffer for <<<<<<< markers using a state machine that handles both standard and diff3 formats.
2. Each conflict block is highlighted via nvim_buf_set_extmark with hl_eol = true so backgrounds extend to the end of each line.
3. When a resolution command is issued, nvim_buf_set_lines replaces the entire block (markers included) with the chosen content lines.
4. The buffer is immediately re-scanned and highlights are updated.
5. When the last conflict is resolved, highlights and keymaps are removed.

Behaviour Notes

Navigation wrapping

When there is no next conflict, ]c wraps to the last block in the buffer. When there is no previous conflict, [c wraps to the first block. If the buffer contains two or more conflicts, a notification is shown on wrap:

conflux: wrapped to last conflict (3/3)
conflux: wrapped to first conflict (1/3)

Live conflict detection

In addition to BufReadPost and BufWritePost, conflux watches TextChanged (normal mode, immediate) and TextChangedI (insert mode, 150 ms debounce). This means conflicts are highlighted as soon as markers appear — including after an undo that restores a previously resolved block.

Atomic undo for resolve-all

:ConfluxAllOurs, :ConfluxAllTheirs, :ConfluxAllBoth, and :ConfluxAllNone apply all replacements as a single undo step. Pressing u once after a resolve-all restores every conflict block at once.

Cursor outside a conflict block

If the cursor is not inside any conflict block when a per-block resolution command is run, conflux shows a warning and makes no changes:

conflux: cursor is not inside a conflict block

LICENCE

The MIT Licence