akinsho / akinsho/git-conflict.nvim
None of the editor commands work (e.g. `:GitConflictChooseOurs`)
- Lingua principale
- Lua
- Stelle
- 1.4k
- Fork
- 70
- Metriche di merge delle PR
- Nessuna PR unita negli ultimi 30g
Descrizione
I am on the latest commit ( also tried latest release version, still happening)
This is my git-conflict config:
```lua
local status, gitConflict = pcall(require, 'git-conflict')
if (not status) then return end
gitConflict.setup({
default_mappings = false, -- disable buffer local mapping created by this plugin
disable_diagnostics = true, -- This will disable the diagnostics in a buffer whilst it is conflicted
})
vim.keymap.set('n', '\co', '\GitConflictChooseOurs\')
vim.keymap.set('n', '\ct', '\GitConflictChooseTheirs\')
vim.keymap.set('n', '\cb', '\GitConflictChooseBoth\')
vim.keymap.set('n', '\cn', '\GitConflictChooseNone\')
vim.keymap.set('n', '\jc', '\GitConflictNextConflict\')
vim.keymap.set('n', '\kc', '\GitConflictPrevConflict\')
-- list all conflicts in quickfix
vim.keymap.set('n', '\cl', '\GitConflictListQf\')
```
Guida per i contributori
Nessuna guida per i contributori indicizzata per questo repository
Valutazione
Questa issue non è ancora stata valutata.