How to git rebase

# How to git rebase

Source: https://www.applification.net/writing/how-to-git-rebase
Markdown: https://www.applification.net/markdown/writing/how-to-git-rebase

Published: 2022-02-12

Updated: 2022-03-21

## Notes for Git Rebasing

> This is literally a mental note for me because I continually forget how to rebase in git

## Hard Rules

First up, there are a couple of rules when rebasing:

1. NEVER rebase onto the main branch, only do a rebase on your own feature branch
2. NEVER pull re-written history, just push

## Rebase Flow

VSCode has a really [nice UI](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) for resolving Git conflicts, so I’ve set [VSCode to open when any conflicts need resolving](https://code.visualstudio.com/docs/editor/versioncontrol#_vs-code-as-git-editor). The rest of the rebase I do from the command line. The flow is:

```
git checkout main
git fetch
git status
git pull
git branch
git checkout ${feature-branch}
git rebase -i main
```

- The interactive flag `-i` will initiate a rebase using VSCode to resolve any conflicts
- If there are no conflicts it will just rebase successfully
- If there are conflicts, resolve in VSCode then

```
git add .
git rebase --continue
```

Once all conflicts have been resolved:

```
git push —-force-with-lease
```

That will push the rebase but abort if there are any issues.

To review and check how the rebase went I use the excellent [Git Graph VSCode extension](https://marketplace.visualstudio.com/items?itemName=mhutchie.git-graph).

![Git Graph in VS Code showing the branch history after the rebase, then commit details and a file diff](/images/writing/how-to-git-rebase-01-f56a24b559.mp4)

## Explore Applification

- [Home](https://www.applification.net/markdown)
- [About Dave](https://www.applification.net/markdown/about)
- [Client work](https://www.applification.net/markdown/client-work)
- [Products](https://www.applification.net/markdown/products)
- [Writing](https://www.applification.net/markdown/writing)
- [Agents & API docs](https://www.applification.net/markdown/agents)
- [Contact routes](https://www.applification.net/about)
- [LinkedIn](https://www.linkedin.com/in/hudsond/)