Conversation

Notices

1. Embed this notice
   John-Mark Gurney (encthenet@flyovercountry.social)'s status on Saturday, 18-Mar-2023 09:32:55 JST John-Mark Gurney

   I just realized one of the reasons why I don't like git rebase. If you manage to f'up the rebase, it's not easy to back it out. Rebase should keep a tag/branch of the state BEFORE the rebase so that you can revert it. There can be false/bad merges that git can't catch, but will result in an unbuildable tree, w/o an easy way to get things back to the way they were before.

   • Embed this notice
     John-Mark Gurney (encthenet@flyovercountry.social)'s status on Saturday, 18-Mar-2023 09:32:53 JST John-Mark Gurney

     in reply to

     • Hugo 雨果

     @whynothugo This case it did work, since there was a merge conflict, but like I said, there can be a conflict free rebase that results in an unbuildable tree, and you have no [easy to find] record of where those commits were originally branched from.

   • Embed this notice
     Hugo 雨果 (whynothugo@fosstodon.org)'s status on Saturday, 18-Mar-2023 09:32:55 JST Hugo 雨果

     in reply to

     @encthenet Does `git rebase --abort` no work for this case?