News for hackers. Stuff that matters.

A comment on Where are my Git UI features from the future?. Parent comment

Re:Where are my Git UI features from the future? by Izkata on Sunday January 08, 2023 @02:17PM (#34302111)
Merge and rebase both have "--abort", which undoes the change if you're in the middle of a conflict.
[ Parent | on HN ]
Re:Where are my Git UI features from the future? by seanalltogether on Sunday January 08, 2023 @02:38PM (#34302312)
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
[ Parent | on HN ]
Re:Where are my Git UI features from the future? by krupan on Sunday January 08, 2023 @10:18PM (#34306310)
After you do --abort you are back in time before the conflict happened. This is literally what you are asking for
[ Parent | on HN ]