Rebasing a Git branch
This tutorial explains the various steps you can take to rebase your local branch onto a remote master branch using the git fetch, git rebase, and git push commands.
Rebase local branch to remote master branch in Git
1. Get changes
We use the git fetch command to fetch all the changes from the remote repository.
pc@JOHN MINGW64 ~/Git (Branch1)
$ git fetch
remote: Enumerating objects: 3, done.
remote: Counting objects: 100% (3/3), done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), 610 bytes | 3.00 KiB/s, done.
From https://github.com/Wachira11ke/Delftscopetech
* [new branch] main -]]> origin/main
2. Make changes
We run git rebase the command to integrate the changes into our branch. The following example will rebase our current branch from the master branch.
pc@JOHN MINGW64 ~/Git (main)
$ git rebase main
When conflicts occur, use git add . the rebase command to resolve them. Do not git add. run the git commit command after the rebase command. After resolving the conflicts, use git rebase --continue to complete the process. If you want to abort the process after resolving the conflicts, use the git rebase --abort command.
3. Push changes to the remote repository
To upload content in the local repository, use the git push -f command, as shown in the following figure.
git push main HEAD -f
-fAny changes made by other developers in the remote repository will be overwritten. The following is a safer way to push changes to the remote repository.
git push --force-with-lease main HEAD
This command will not overwrite changes made by other developers in the remote repository.
Rebasing and merging are used to integrate changes from one branch into another. Rebasing is the process of updating a feature branch without disturbing the branch history, allowing for a cleaner commit history.
It is the opposite of git merge, which creates conflicting branches when sharing with others.
For reprinting, please send an email to 1244347461@qq.com for approval. After obtaining the author's consent, kindly include the source as a link.
Related Articles
Git force pull
Publish Date：2025/03/29 Views：165 Category：Git
-
In this tutorial, we will learn how to force pull changes from a remote repository in Git. Sometimes, we may need to discard local modifications and replace them with updates from a remote repository in a collaborative development environme
Git pulls Master into the branch
Publish Date：2025/03/29 Views：193 Category：Git
-
When developing software using the Git tool, you can create different branches for different features. When you make changes to master, these changes are not automatically added to other branches. This article will explain how to pull all t
Installing Git in Cygwin
Publish Date：2025/03/29 Views：116 Category：Git
-
Git is considered an active, innovative and highly recommended distributed version control system with a fantastic standalone command line while providing us with advanced features and complete internal methods. What is Cygwin Cygwin is con
Displaying remote repository information in Git
Publish Date：2025/03/29 Views：139 Category：Git
-
This tutorial is about displaying information about remote repositories in Git. We use Git, a version control system, to track changes made to files in our project directories through Git repositories. Usually, local repositories are tracke
Deleting a remote repository in Git
Publish Date：2025/03/29 Views：130 Category：Git
-
When we commit the wrong data to the origin, push it to the origin and merge it to the current branch. But later we realize that we don't need to do the merge in that repo, so the question here is how to undo or revert the merge commit that
Setting up a Git remote repository
Publish Date：2025/03/29 Views：78 Category：Git
-
This article will explain how to add or delete remote repositories. A remote repository is a project hosted somewhere, such as Github/Gitlab. Adding a remote repository allows us to use a short name (alias) to execute commands instead of ty
.git Directory Explanation
Publish Date：2025/03/29 Views：65 Category：Git
-
In this article, we'll introduce Git folders .git . We'll cover why Git creates folders and what they contain. .git What are folders in Git ? Git is a widely used version control system. Git repositories store the changes you make in your p
Cherry-Pick Merge Commits in Git
Publish Date：2025/03/29 Views：105 Category：Git
-
When multiple developers from the same team are working on a project, regardless of the complexity of the project, handling and managing changes between Git branches becomes very difficult. Sometimes, we need to merge some specific commits
Fatal: Refusing to Merge Unrelated Histories error in Git
Publish Date：2025/03/29 Views：123 Category：Git
-
This article outlines the steps required to resolve the fatal: refusing to merge unrelated histories error in Git. We usually encounter such errors when trying to merge two unrelated Git projects into one branch. It pops up when the receivi
