Skip to Content
Navigation:

A stick figure smiling

Here's a preview from my zine, Oh Shit! Git!! If you want to see more comics like this, sign up for my saturday comics newsletter or browse more comics!

get the zine!
Image of a comic. To read the full HTML alt text, click "read the transcript". get the zine!
read the transcript!

This can happen when you’re rebasing many commits at once.

  1. Escape the rebase of doom:
    git rebase --abort

  2. Find the commit where your branch diverged from main:
    git merge-base main my-branch

  3. Squash all the commits in your branch together:
    git rebase -i $SHA_YOU_FOUND

  4. Rebase on main:
    git rebase main

person: alternatively, if you have 2 branches with many conflicting commits, you can just merge!