News for hackers. Stuff that matters.

A comment on It's time to get the Posix elephant off our necks. Parent comment

Re:It's time to get the Posix elephant off our necks by marginalia_nu on Thursday February 23, 2023 @02:53AM (#34908013)
It's easy if you always do exactly the right thing in the right order and never make mistakes, but if you for example want to undo a git merge[1], god have mercy.

[1] https://opensource.apple.com/source/Git/Git-26/src/git-htmld...

[ Parent | on HN ]
Re:It's time to get the Posix elephant off our necks by psychoslave on Thursday February 23, 2023 @04:02AM (#34908423)
In doubt, I create a new branch from the main one, and test it goes when merging the one holding changes. It something goes wrong, at least the main branch is unaffected.

Of course, you must already have some intuition that something could go wrong. :D

[ Parent | on HN ]
Re:It's time to get the Posix elephant off our necks by imetatroll on Thursday February 23, 2023 @07:22AM (#34909524)
Reflog lets you see where HEAD has traveled from. Just go back in time. This isn't actually a hard problem to solve.

If that sounds difficult just create a branch prior to merging so that you know where to reset your failed branch to.

[ Parent | on HN ]
Re:It's time to get the Posix elephant off our necks by BeeOnRope on Thursday February 23, 2023 @08:06AM (#34910004)
They are trying to solve this problem without rewriting the branch.
[ Parent | on HN ]