Rebase

Published: 2023-06-28
Updated: 2024-02-02

Rebase onto develop 🔗

git rebase develop

If you’d already pushed the branch before you’ll need to do a force push

git push -f

Rebase interactive 🔗

Source: https://git-scm.com/docs/git-rebase

Unpushed 🔗

Observation: Only seems to rebase unpushed commits.

git rebase -i

Including Pushed 🔗

git rebase -i --onto develop

Rebase your branch after someone else force pushes to it 🔗

These erase what you have locally with the info from remote

This works for me (but saw it didn’t work for others) 🔗

git pull -f

This one worked when the one above didn’t work 🔗

Source: Trippy Maintainers Chat (Included a link to guidance)

git fetch
git reset origin/my-branch --hard