akinsho / akinsho/git-conflict.nvim
None of the editor commands work (e.g. `:GitConflictChooseOurs`)
- Vorherrschende Sprache
- Lua
- Sterne
- 1.4k
- Forks
- 70
- PR-Merge-Kennzahlen
- Keine gemergten PRs in 30 T.
Beschreibung
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\')
```
Beitragsleitfaden
Für dieses Repository ist kein Beitragsleitfaden indexiert
Bewertung
Dieses Issue wurde noch nicht bewertet.