3 ms·

Merge and rebase both have "--abort", which undoes the change if you're in the middle of a conflict.

• seanalltogether 4y ago
  To be clear, I'd like to see the future conflict while my files remain in a clean state, so that I reconsider my own changes or work around the conflict before it happens
  • krupan 4y ago
    After you do --abort you are back in time before the conflict happened. This is literally what you are asking for