halfbrained / cuda_git_conflict

CudaText plugin. Adds a convenient command to solve git merge conflicts

halfbrained/cuda_git_conflict Issues

set caret to start of current conflict
Closed 7 months ago8
patch from Marcus
Closed 3 years ago
When called on clean file, must show some statusbar msg like "No Git conflict found"
Closed 3 years ago3
Choosing appropriate dialog height
Closed 3 years ago3
add some caption to dlg_menu like 'Git Conflict Solver'
Closed 3 years ago
caret pos after change
Closed 3 years ago2
homepage=(Fill the GitHub repo URL)
Closed 3 years ago1
handle n conflicts
Closed 3 years ago3
fixed readme
Closed 3 years ago1