akinsho / git-conflict.nvim

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

fix(mapping)!: swap prev and next mapping for conflicts #89

Closed seblj closed 4 months ago

seblj commented 4 months ago

This is a breaking change, but this is more in line with how mappings with brackets are in neovim. See for example:

]d -> next diagnostic ]s -> next misspelled word ]r -> next rare word ]c -> next diff

I couldn't find anything to generate the vim-docs, so I just edited them manually😅

akinsho commented 4 months ago

Hi @seblj so this is I think the 5th or so PR raised to swap the order of these mappings. I think people really have conflicting opinions on what the correct order is. I've merged a few of these over time but think ultimately I should have just stuck to one orientation and left it at that and people are free to remap it since breaking the mappings every few versions is unfair to users.

If I had a sense of what the majority of users would prefer then I could at least go with that but I honestly expect that a month or two after I raise I merged this someone else would appear to point out that it's the wrong way round

seblj commented 4 months ago

But what is the argument to the way they are now? Are there any ones in neovim where [ means next? From all the ones I can find, ] always means next, so I find it a bit strange that it is different here

akinsho commented 4 months ago

I just went through the history of the mapping changes and there are about five of them or so It really seems to be something people are very keen to have changed to some version of what they like but as far as I could tell from most of the PRs people were trying to change them to this. So I'm going to merge this and then I think there will be no future mapping changes ever. I think going forward people will have to just change them in their config. I should have just taken a hard stance the first time. Thanks @seblj