Too many messy commits to clean up

Recovery steps

1. 1

   Safety branch

   In case the result isn't what you want.

   Safe

   $ git branch backup/before-squash

2. 2

   Simplest: everything into one commit

   Moves the branch back to where it left main, keeps all changes staged, then one commit.

   Caution

   $ git reset --soft $(git merge-base HEAD main)
   $ git commit -m "feat: the whole feature, cleanly"

3. 3

   Finer: choose commit by commit

   In the editor, replace “pick” with “squash” (or “fixup”) on the commits to merge into the previous one.

   Caution

   $ git rebase -i main

4. 4

   Update the pushed branch

   Only on your own branch.

   Destructive

   $ git push --force-with-lease

These procedures are provided for information only. Read each command and adapt it to your situation before running it. Disclaimer

Other disasters