JIYIK CN >

When working in Git with many developers and analysts working on various branches simultaneously, we may encounter many problems. A common problem is when one team member makes changes in his local branch while others work on that remote branch and then merge their changes to the remote master branch.

Also, if we push the local branch we are working on without pulling the remote master branch, then we have to rewrite other developers' changes in the remote master branch.

This article is about git update master branchthe command, and we will discuss the complete Git update branch model. 分支This functionality can be found in most modern and unique version control systems.

In Git, the most important and useful feature is branching, which is a part of our daily development process. This article will guide us to update Git branches using the methods mentioned below.

If we want our git feature branch to be updated with new changes from the master branch, we need to follow either of the following techniques:

• merge
• Rebase

Merging creates more commits, while rebasing rewrites the history in your repository.

Assume we are on any feature branch in our repository that we create to add sub-features during our development process.

The current status of the branch is as follows.

git branch
* feature branch

And new commits are available on the origin/master branch of the repository:

git fetch

From git repository
   xyz88874..def74125  master -> origin/master

So how do we merge the above commits from the local branch into the main branch? We now have two solutions, the first is to use mergethe command, and the other is the command in Git rebase.

In Git, use mergethe command to update the main branch

Since we want to merge the latest commit of our local branch into the master branch, we can use the following command to merge the commits.

git merge origin/master

When we are going to commit the changes of the local branch to the remote branch, if we find some conflicts in it, we will first merge the conflicts into one file and create a new merge commit for it. If we do not find conflicts in the working directory, the new commit will be pushed directly to the remote branch.

rebaseUpdate the main branch using the command

Since we want to rebase the latest commit from our local branch onto the master branch, we can use the following command to rebase the commit.

git rebase origin/master

Rebase moves all divergent commits of the topic branch up. This means that the diverged commits will now \new commit hashes\consist of , as its history will be written to the master branch again.

In addition, if our feature branch has been pushed to the remote master branch, we need to force push to update it:

git push origin feature --force

However, if other developers have already checked out the feature branch, this approach is not recommended and it's best to stick to the merge command in this case.