search

akinsho / git-conflict.nvim

A plugin to visualise and resolve merge conflicts in neovim
953 stars 34 forks source link

feat: add visual mode mappings #78

Closed CWood-sdf closed 3 months ago

CWood-sdf commented 8 months ago

This PR solves issue #34 by allowing the "Choose ..." mappings to be called in visual mode and resolving the conflicts in the visual range with the given choice

Though in my testing, the default 'c.' mappings did not work because vim would ignore the second character

jugarpeupv commented 3 months ago

ey @akinsho is there anything left for this PR to be accepted?

akinsho commented 3 months ago

@jugarpeupv lots of issues across other repos and not much time, I appreciate you're keen for it but it is on my radar, no need for a ping.

akinsho commented 3 months ago

Probably won't have time soon to test this manually so will merge for now but if there's any breakage I'll roll it back.

jugarpeupv commented 3 months ago

@akinsho many thanks, appreciate it. I tested the fork and it worked fine