• CMahaff@lemmy.world
    link
    fedilink
    English
    arrow-up
    3
    ·
    2 months ago

    Another solution to this situation is to squash your changes in place so that your branch is just 1 commit, and then do the rebase against your master branch or equivalent.

    Works great if you’re willing to lose the commit history on your branch, which obviously isn’t always the case.

    • Cyborganism@lemmy.ca
      link
      fedilink
      arrow-up
      2
      ·
      2 months ago

      Yeah that’s what I did as a workaround. Reset (soft) to the first parent commit and do a single commit with all the changes.