merge.nvim 🛠️

In-development Neovim plugin for enhanced merge conflict resolution.

Installation

Using lazy.nvim:

{
    "micahkepe/merge.nvim",
    lazy = false, -- to make the plugins immediately available
    config = function()
        require("merge").setup {}
    end,
}

Usage

The plugin provides the following commands and keymaps:

• :MergeEditor - Open the merge editor UI
• <leader>mc - Accept current change
• <leader>mi - Accept incoming change
• <leader>mb - Accept both changes

Default Settings

Configuration

require("merge").setup({
    -- default setting overrides here
})

TODOs

• Testing with plenary.nvim testing module
• Smart combination strategy
• Diff syntax highlighting
• Conflict highlighting, similar to git-conflict.nvim