git rebase basic usage - Commands & Configuration

Introduction

Sometimes your work branch falls behind the main branch. Git rebase helps you update your branch by moving your changes on top of the latest main branch commits. This keeps history clean and easy to follow.

When you want to update your feature branch with the latest changes from the main branch before merging.

When you want to keep a linear project history without extra merge commits.

When you want to fix conflicts early by applying your changes on top of updated code.

When you want to clean up your commit history before sharing your branch.

When you want to avoid confusing merge commits in your project timeline.

Commands

Switch to your feature branch where you want to apply the rebase.

Terminal

git checkout feature-branch

Expected Output

Switched to branch 'feature-branch'

Fetch the latest commits from the remote repository to ensure you have the newest main branch updates.

Terminal

git fetch origin

Expected Output

remote: Enumerating objects: 5, done.

remote: Counting objects: 100% (5/5), done.

remote: Compressing objects: 100% (3/3), done.

remote: Total 3 (delta 2), reused 0 (delta 0), pack-reused 0

Unpacking objects: 100% (3/3), 1.23 KiB | 1.23 MiB/s, done.

Reapply your feature branch commits on top of the latest main branch commits fetched from origin. This updates your branch with the newest changes.

Terminal

git rebase origin/main

Expected Output

First, rewinding head to replay your work on top of it...

Applying: Add new feature implementation

Check the status to confirm the rebase completed successfully and your branch is up to date.

Terminal

git status

Expected Output

On branch feature-branch

Your branch is up to date with 'origin/feature-branch'.

nothing to commit, working tree clean

Key Concept

If you remember nothing else from this pattern, remember: git rebase moves your changes on top of the latest main branch commits to keep history clean and updated.

Common Mistakes

Running git rebase without fetching the latest main branch updates first.

Your rebase will not include the newest changes from the main branch, so your branch stays outdated.

Always run git fetch origin before git rebase origin/main to get the latest commits.

Trying to rebase a branch that has already been pushed and shared without coordination.

Rebasing rewrites history, which can confuse others who have the old branch version.

Only rebase local branches or coordinate with your team before rebasing shared branches.

Ignoring conflicts during rebase and not resolving them properly.

Unresolved conflicts stop the rebase process and leave your branch in a broken state.

Carefully resolve conflicts, then run git rebase --continue to finish the rebase.

Summary

Switch to your feature branch with git checkout feature-branch.

Fetch the latest main branch commits using git fetch origin.

Rebase your branch on top of the updated main branch with git rebase origin/main.

Check your branch status after rebase with git status to confirm success.