https://github.com/zegervdv/settle.nvim

Settle your merge conflicts from Neovim
https://github.com/zegervdv/settle.nvim

merge-conflicts neovim neovim-lua-plugin neovim-plugin

Last synced: 27 days ago
JSON representation

Settle your merge conflicts from Neovim

• Host: GitHub
• URL: https://github.com/zegervdv/settle.nvim
• Owner: zegervdv
• License: mit
• Created: 2021-12-31T11:13:14.000Z (almost 3 years ago)
• Default Branch: master
• Last Pushed: 2022-08-05T06:51:32.000Z (over 2 years ago)
• Last Synced: 2024-08-07T18:35:54.815Z (3 months ago)
• Topics: merge-conflicts, neovim, neovim-lua-plugin, neovim-plugin
• Language: Lua
• Homepage:
• Size: 11.7 KB
• Stars: 3
• Watchers: 3
• Forks: 0
• Open Issues: 0
• Metadata Files:
  • Readme: README.md
  • License: LICENSE.md

Awesome Lists containing this project

README

        
# Settle.nvim

A Neovim plugin to help you settle your merge conflicts.

**requires Neovim 0.7.0 or later**

Inspired by [splice.vim](https://github.com/sjl/splice.vim/).

## Configuration

Using packer, install and configure the options (leave option out to use default value shown in example)

```lua

use {

  'zegervdv/settle.nvim',

  opt = true,

  cmd = { 'SettleInit' },

  config = function()

    require('settle').setup {

      wrap = true,

      symbol = '!',

      keymaps = {

        next_conflict = '-n',

        prev_conflict = '-N',

        use_ours = '-u1',

        use_theirs = '-u2',

        close = '-q',

      },

    }

  end,

}

```

### Git

In `~/.gitconfig`:

```gitconfig

[merge]

  tool = settle

[mergetool "settle"]

  cmd = "nvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SettleInit'"

  trustExitCode = true

```

### Mercurial

In `~/.hgrc`:

```conf

[merge-tools]

settle.executable = nvim

settle.args = -f $base $local $other $output -c 'SettleInit'

settle.premerge = keep

settle.priority = 1

```