issues
search
akinsho
/
git-conflict.nvim
A plugin to visualise and resolve merge conflicts in neovim
1k
stars
35
forks
source link
issues
Newest
Newest
Most commented
Recently updated
Oldest
Least commented
Least recently updated
Can we add word-diff like gitsigns does?
#45
unphased
closed
1 year ago
2
[Feature Request] Per character diff highlight
#44
nikolasetiawan
closed
1 year ago
1
docs: add type to ConflictSide
#43
ghost
closed
1 year ago
0
feat: user mappings config
#42
bennypowers
closed
1 year ago
1
Make mappings configurable
#41
bennypowers
closed
1 year ago
0
fix(color): reset the color after colorscheme was changed (#39)
#40
ofseed
closed
1 year ago
0
Highlights not available after changing the colorscheme
#39
ofseed
closed
1 year ago
1
Highlights not available after changing the colorscheme
#38
ofseed
closed
1 year ago
2
Bug: list qf command gives error when run from startup screen
#37
Chaitanyabsprip
closed
1 year ago
10
Conflict markers not shown until I restart vim
#36
uloco
opened
1 year ago
1
feat: add option to disable commands
#35
aspeddro
closed
1 year ago
2
Feature: Choose Ours/Theirs/Both for entire File
#34
ariel-frischer
opened
2 years ago
10
git config to match this plugin
#33
nanomoeamezao
closed
2 years ago
1
where to find create_buffer_local_mappings ?
#32
caiyanhu
closed
2 years ago
1
docs(README): fix typo
#31
CharlesChiuGit
closed
2 years ago
0
Git conflict doesn't show
#30
HungLe14
closed
5 months ago
10
Process failed to start: too many open files
#29
balazser
closed
1 year ago
7
git-conflict.nvim [string"..."]:0: loop or previous error loading module 'git-conflict'
#28
cothi
closed
2 years ago
3
docs(README): add missing comma to autocommand
#27
prdanelli
closed
2 years ago
1
Missing comma in Readme autocommand example.
#26
prdanelli
closed
2 years ago
2
refactor: add git directory watcher
#25
akinsho
closed
2 years ago
2
feat: Add `GitConflictRefresh`
#24
xiyaowong
closed
2 years ago
11
feat: add keymap descriptions.
#23
dsully
closed
2 years ago
0
Keymap description?
#22
dsully
closed
2 years ago
2
Call GitConflictListQf failed with lua 5.4
#21
hexh250786313
closed
2 years ago
3
fix: Reverse hl groups and adjust shade
#20
thomashoggard
closed
2 years ago
1
[enhancement] Make colour shade configurable
#19
thomashoggard
closed
2 years ago
3
doc: added missing default mapping `co` for `choose ours`
#18
kohane27
closed
2 years ago
1
[enhancement] only GUI colours are supported
#17
balazser
closed
2 years ago
4
fix: improve check for visited buffer when populating qf
#16
louishuyng
closed
2 years ago
7
Call GitConflictListQf got error
#15
thieung
closed
2 years ago
9
Is this support lazy-loading?
#14
thieung
closed
2 years ago
1
Mappings: [x and ]x should be swapped
#13
tom-anders
closed
2 years ago
1
fix: clear extmark if conflict is invalid
#12
seblj
closed
2 years ago
0
Delete extmarks when deleting conflict marker manually
#11
seblj
closed
2 years ago
6
attempt to index field 'keymap' (a ni l value)
#10
MuhammadSawalhy
closed
2 years ago
2
fix: use nvim_exec_autocmds after rename on nightly
#9
seblj
closed
2 years ago
0
GitConflictListQf attempt to perform arithmetic on field 'range_start'
#8
ram02z
closed
2 years ago
3
fix: throttle checking conflicted files
#7
akinsho
closed
2 years ago
0
fix(color): add fallback color
#6
xiyaowong
closed
2 years ago
0
fix: use nvim_exec_autocmd
#5
xiyaowong
closed
2 years ago
1
feat: add a command to display conflicts in qf.
#4
windwp
closed
2 years ago
1
feat: support diff3 conflict style
#3
akinsho
closed
2 years ago
0
fix: fix condition to create autocmd
#2
xiyaowong
closed
2 years ago
0
Images
#1
akinsho
closed
2 years ago
1
Previous