Merge and rebase both have "--abort", which undoes the change if you're in the m... | Hacker News

Hacker News new | past | comments | ask | show | jobs | submit

login

Izkata on Jan 8, 2023 | parent | context | favorite | on: Where are my Git UI features from the future?

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

seanalltogether on Jan 8, 2023 [–]

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 on Jan 9, 2023 | [–]

After you do --abort you are back in time before the conflict happened. This is literally what you are asking for

Join us for AI Startup School this June 16-17 in San Francisco!
Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact