Avoid asking about the same conflict twice

Open anordal opened this issue 2 years ago • 4 comments

Implements https://github.com/mystor/git-revise/issues/132.

This PR also contains some test prework that can go in first if wanted.

May 14 '23 21:05 anordal

(Let me squash my fixups so far. State before: 4da9a43)

May 29 '23 18:05 anordal

I think it's fine to always squash fixups eagerly. People who have remembered a previous state can use git range-diff

May 29 '23 19:05 krobelus

Ready for more feedback. I would think this is ready to take if anyone wants it.

I've switched to using this branch for my own use.

Jun 08 '23 17:06 anordal

looks great, thanks! I'm using it as well, it's very handy

Jun 13 '23 20:06 krobelus