How to Rebase from Dev to Stage Branch in GitHub: Step-by-Step Guide

If you've been using Git for a while, you know how vital it is to keep your branches clean and your commit history tidy.

Rebasing in Git is a great way to do just that—helping you maintain an organized codebase without all the clutter.

There are two easy ways to handle rebasing. Let’s show you the step-by-step process for rebasing, with interactive demos to guide you along the way.

We’ll break it down into two simple methods you can follow:

1. How to Rebase from Dev to Stage Branch (Step-by-Step Guide)
2. How to Perform a 3-Command Rebase (Alternative Method)

Let’s get started!

1. How to Rebase from Dev to Stage Branch

‍

Steps to follow:

1. Navigate to the dev branch. Run the command-

git checkout dev

2. Pull the latest changes from DEV branch. Run the command-

git pull origin dev

3. Checkout to stage branch. Run the command-

git checkout stage

4. Pull latest changes from stage branch. Run the command-

git pull origin stage

5. Checkout to dev branch. Run the command- 

git checkout dev

6. Rebase stage into dev. Run the command-

git rebase origin/stage

7. Finally push the rebased dev branch. Run the command-

git push origin dev --force-with-lease

The `--force-with-lease` ensures your push doesn't accidentally overwrite any changes.

2. How to Perform a 3-Command Rebase

‍

Steps to follow:

1. Pull the latest changes from dev branch. Run the command-

git pull origin dev

2. Fetch latest changes from stage branch and rebase it. Run the command-

git pull origin --rebase stage

3. Push the rebased dev branch. Run the command-

git push origin dev --force-with-lease

That's it! The stage branch has been rebased successfully.

Conclusion

Adopting this process not only ensures a clean and linear commit history but also helps us effectively resolve conflicts, leading conflict-free deployments and more manageable codebase.