issues
search
akinsho
/
git-conflict.nvim
A plugin to visualise and resolve merge conflicts in neovim
953
stars
34
forks
source link
issues
Newest
Newest
Most commented
Recently updated
Oldest
Least commented
Least recently updated
Relies on parameter instead of getting current bufnr when render
#94
myste1tainn
opened
2 weeks ago
0
Fix Windows path separator
#93
Daydreamer-riri
closed
3 weeks ago
0
This plugin dosen't work for me
#92
Daydreamer-riri
closed
2 weeks ago
5
Bug: nil error on moving to next conflict when first opening the conflict file
#91
FredrikMorstad
opened
2 months ago
1
chore(main): release 2.1.0
#90
github-actions[bot]
opened
3 months ago
0
fix(mapping)!: swap prev and next mapping for conflicts
#89
seblj
closed
4 months ago
3
docs: fix old nvim-pqf plugin link in README
#88
wassimk
closed
4 months ago
0
fix: extmarks missing from final line
#87
jradam
closed
4 months ago
2
fix: off-by-one error in find_position
#86
jradam
closed
4 months ago
1
Fixing an off-by-one error with find_position
#85
jradam
closed
4 months ago
0
Bug: Choosing ours/theirs/base does not work when cursor is on the last line of the change
#84
b0o
closed
4 months ago
2
chore(main): release 2.0.0
#83
github-actions[bot]
closed
4 months ago
1
fix: swap mappings for prev/next conflicts
#82
meetmangukiya
closed
4 months ago
3
Fix #30, add support for git worktrees
#81
chase
closed
4 months ago
2
Plugin doesnt work in specific file types
#80
ep4sh
opened
6 months ago
0
crash if use 4 version of file
#79
palandovalex
opened
6 months ago
0
feat: add visual mode mappings
#78
CWood-sdf
closed
3 months ago
4
Fix typo in README code snippet for auto commands
#77
zedutch
closed
8 months ago
0
chore(main): release 1.3.0
#76
github-actions[bot]
closed
8 months ago
1
Add conflict_count function
#75
daanvdk
closed
9 months ago
3
colorscheme highlights issue
#74
itsfrank
closed
10 months ago
1
Feature/default colors option
#73
FredrikMorstad
closed
2 months ago
0
Flag for using the default highlight colours
#72
FredrikMorstad
closed
5 months ago
3
chore(main): release 1.2.2
#71
github-actions[bot]
closed
1 year ago
1
fix(quickfix): invoke callback once with all items
#70
MariaSolOs
closed
1 year ago
0
fix(mappings): fix prev/next default key binding
#69
mochaaP
closed
11 months ago
2
fix(quickfix cmd): construct items from visited buffers
#68
MariaSolOs
closed
1 year ago
4
chore(main): release 1.2.1
#67
github-actions[bot]
closed
1 year ago
1
fix(mappings): set mappings if needed when parsing buffer
#66
MariaSolOs
closed
1 year ago
0
Keymaps don't work when closing and reopening a conflicted file
#65
MariaSolOs
closed
1 year ago
0
bug: File paths in quickfix list are incorrect
#64
MariaSolOs
closed
1 year ago
0
feat: Add an open_qf_command setting
#63
MariaSolOs
closed
1 year ago
2
Not working when dealing with rebase conflicts
#62
partounian
closed
1 year ago
1
Feature request: Expose a way to use Trouble with GitConflictListQf
#61
MariaSolOs
closed
1 year ago
2
chore(main): release 1.2.0
#60
github-actions[bot]
closed
1 year ago
1
fix #58
#59
towry
closed
1 year ago
3
[bug] not working if zsh output something else first.
#58
towry
closed
1 year ago
1
Highlighting does not work if markers are not visible
#57
uloco
opened
1 year ago
2
fix: show correct defaults in README
#56
seblj
closed
1 year ago
0
Introduce a new event GitConflictAborted or fire GitConflictResolved when git merge conflict is aborted
#55
nsoufian
opened
1 year ago
3
Highlighting problems with AstroNvim
#54
theRoboxx
closed
1 year ago
1
chore(main): release 1.1.2
#53
github-actions[bot]
closed
1 year ago
1
Theming highlights no longer possible
#52
uloco
closed
1 year ago
3
chore(main): release 1.1.1
#51
github-actions[bot]
closed
1 year ago
1
"Invalid buffer id: 1" error when buffer loaded from last session
#50
uloco
closed
1 year ago
5
chore(main): release 1.1.0
#49
github-actions[bot]
closed
1 year ago
1
Feature request: choose under cursor
#48
pesader
opened
1 year ago
4
Reverse goto mapping (fix #13)
#47
r-darwish
closed
1 year ago
4
Pre PR disabling git-conflict on demand
#46
ttytm
closed
1 year ago
5
Can we add word-diff like gitsigns does?
#45
unphased
closed
1 year ago
2
Next