Feature request: pick only one conflict

[max-baz]

When I tried it for the first time, I instinctively assumed that kakmerge-next-conflict and kakmerge-pick work in tandem — you jump to a conflict, select which version you prefer and jump on the next one. Currently kakmerge-pick replaces all conflicts with the selected version, until I read README I thought I'm experiencing a bug.

Can we have kakmerge-pick resolve one conflict and kakmerge-pick-all resolve all conflicts?

[lenormf]

Probably. I thought about it but didn't really need the feature at the time of writing the script, maybe I'll get around to implementing that.

[basbebe]

+1