search

akinsho / git-conflict.nvim

A plugin to visualise and resolve merge conflicts in neovim
1k stars 35 forks source link

Can we add word-diff like gitsigns does? #45

Closed unphased closed 1 year ago

unphased commented 1 year ago

It would be nice if we have diff3 enabled (or even if not) to be able to see exactly what sections changed in the lines that got changed. Let me know if you need more details or screenshots to explain what I mean.

akinsho commented 1 year ago

@unphased the scope of this plugin is purposely very narrow, i.e. it just highlights the conflicted regions, it doesn't do a diff or any of that as you've pointed out gitsigns does this, as does diffview i.e. there are many plugins to use to get granular about the conflict and how you want to handle it. To my mind this plugin is aimed a quickly navigating and choosing a hunk. If you want to get granular and you need to diff and carefully select some bits the I recommend using diffview to open a full diff.

For the record I'm not against this feature so if you have the time and inclination please feel free to raise a PR but unless you are going to do it, I'm fairly happy with the current scope and don't personally really feel the need to extend it to do this myself

unphased commented 1 year ago

Makes sense and I definitely feel you. I'm pretty happy with the manual conflict workflow right now because only in conflict situations are more than two or three colors (removed, added, and sometimes modified) needed and this would creep the complexity involved quiiiite a bit. Yeah if anything, what i described seems a better fit implemented in one of those projects.