Add ]n and [n to jump between conflict markers

[ocharles]

vim-unimpaired adds ]n and [n to navigate SCM conflict markers. It'd be great to have this navigation feature in Helix, too!

[wes-adams]

i'm gonna take a stab at this one

[ocharles]

I look forward to seeing what you come up with! I don't know any Rust but I'd love to see how this looks, then maybe I can contribute one day :)

[wes-adams]

brace yourself....

Kazam_screencast_00000.mp4

[wes-adams]

the pull request is very much in draft status. it needs to be cleaned up.

after more trial and error and failing than i'd like to admit, it finally worked, so i pushed what i had.

i'll get it cleaned up, and then get feedback.

[ocharles]

Great work!

[wes-adams]

cleaned up the merge request

search works in both directions

https://asciinema.org/a/GXSmICT22D1OOY7VoXNQCsvAt

[wes-adams]

i think this issue might be dead. seems that this feature is provided in a separate PR: #4650

@ocharles - maybe pull #4650 and verify that it satisfies this issue?

fwiw my work is here: #4708

[ocharles]

@wes-adams I don't think #4650 is a satisfactory fix for me. I use three-way conflict markers, and ]g doesn't seem to take me to each individual section, whereas your PR does. I'll try and put an asciinema together, but I don't think it's that #4650 does anything wrong, it's just doing something different.

[pascalkuthe]

@ocharles that is already covered by searching with / <<<<<< as mentioned in #4708. In fact that is more ore less exactly what that PR was doing. If it's something you need frequently you can already bind that search to a key.
I think this feature is a bit too specific for core and already covered by other feature. In fact they cover it better because they support jumping to both the next change with #4708 or the next section with / <<<<<< depending on your needs (I use both often)