Hi,

Let's say I'm merging a branch with many conflicts.
I resolved some of them, but then can't proceed or need to switch elsewhere.

Will it be a good practice to call `git rerere` to remember resolved
conflicts, so that in the future
when I re-merge, I get my half-done merge back?

I couldn't find such use of rerere in the internet.

How can I save the merge/restore progress otherwise?

---
Best Regards,
Ilya Kantor

Reply via email to