How To Update Master Branch Git

Welcome to our ultimate guide to the git merge and git rebase commands. This tutorial will teach yous everything y'all need to know most combining multiple branches with Git.

Git Merge

The git merge control volition merge any changes that were made to the code base of operations on a separate branch to your current co-operative as a new commit.

The control syntax is as follows:

                git merge BRANCH-NAME

For example, if you lot are currently working in a branch named dev and would similar to merge any new changes that were fabricated in a branch named new-features, you would event the post-obit command:

                git merge new-features

Notation: If there are any uncommitted changes on your electric current branch, Git will not allow you to merge until all changes in your current branch have been committed. To handle those changes, y'all tin either:

Create a new co-operative and commit the changes

                git checkout -b new-branch-name git add . git commit -m "<your commit message>"

Stash them

                git stash               # add them to the stash git merge new-features  # practice your merge git stash popular           # become the changes back into your working tree

Abandon all of the changes

                git reset --hard        # removes all awaiting changes

Git Rebase

Rebasing a co-operative in Git is a mode to move the entirety of a branch to some other indicate in the tree. The simplest case is moving a branch further upwards in the tree. Say nosotros have a branch that diverged from the master branch at point A:

                                  /o-----o---o--o-----o--------- co-operative --o-o--A--o---o---o---o----o--o-o-o--- master

When you lot rebase yous tin motility it like this:

                                  /o-----o---o--o-----o------ branch --o-o--A--o---o---o---o----o--o-o-o master

To rebase, make sure you take all the commits you desire in the rebase in your master co-operative. Cheque out the branch you want to rebase and blazon git rebase master (where master is the branch yous want to rebase on).

It is as well possible to rebase on a different co-operative, so that for case a branch that was based on another branch (let's phone call it characteristic) is rebased on master:

                                  /---o-o branch            /---o-o-o-o---o--o------ feature ----o--o-o-A----o---o--o-o-o--o--o- master

Afterwards git rebase master co-operative or git rebase master when you accept checked out the branch, you'll get:

                                  /---o-o-o-o---o--o------ feature ----o--o-o-A----o---o--o-o-o--o--o- master                                   \---o-o branch

Git rebase interactive in the console

To use git rebase in the panel with a list of commits you lot tin can choose, edit or drop in the rebase:

Enter git rebase -i Caput~v with the last number being any number of commits from the most contempo backwards you want to review.
In vim, printing esc, then i to showtime editing the exam.
On the left hand side you can overwrite the pick with one of the commands below. If you desire to squash a commit into a previous i and discard the commit message, enter f in the place of the choice of the commit.
Save and quit your text editor.
When rebase is stopped, make the necessary adjustments, and then use git rebase --continue until rebase is successful.
If it rebases successfully then yous need to force push your changes with git push -f to add together the rebased version to your remote repository.
If there is a merge conflict, at that place are a number of ways to fix this, including following the suggestions in this guide. Ane style is to open the files in a text editor and delete the parts of the code you do not want. Then employ git add <file proper name> followed by git rebase --continue. You tin skip over the conflicted commit by inbound git rebase --skip, terminate rebasing by running git rebase --abort in your console.

                pick 452b159 <message for this commit> pick 7fd4192 <bulletin for this commit> pick c1af3e5 <bulletin for this commit> pick 5f5e8d3 <bulletin for this commit> choice 5186a9f <message for this commit>  # Rebase 0617e63..5186a9f onto 0617e63 (30 commands) # # Commands: # p, pick = utilize commit # r, reword = employ commit, but stop to edit the commit message. # e, edit = use commit, but stop to ameliorate or add together commit. # s, squash = use commit, meld into previous commit and finish to edit the commit message. # f, fixup = like "squash", but discard this commit'southward log message thus doesn't finish. # x, exec = run command (the rest of the line) using shell # d, drop = remove commit # # These lines can be re-ordered; they are executed from summit to bottom.  # # If you remove a line here THAT COMMIT Will Be LOST. # # All the same, if you remove everything, the rebase will be aborted. # # Notation that empty commits are commented out

Merge Conflicts

A merge conflict is when yous brand commits on separate branches that modify the same line in conflicting means. If this happens, Git will not know which version of the file to keep in an mistake message similar to the following:

                Conflict (content): Merge conflict in resumé.txt Automatic merge failed; fix conflicts and then commit the result.

If you look at the resumé.txt file in your code editor, you lot tin run across where the conflict took identify:

                <<<<<<< HEAD Address: 808 South Street ======= Accost: 505 North Street >>>>>>> updated_address

Git added some additional lines to the file:

<<<<<<< HEAD
=======
>>>>>>> updated_address

Call up of======= equally the dividing line of the conflict. Everything between <<<<<<< Head and ======= is the content of the electric current co-operative that the HEAD ref is pointing to. On the other hand, everything between======= and >>>>>>> updated_address is the content in the branch existence merged, updated_address.

Git Merge vs Git Rebase

Both git merge and git rebase are very useful commands, and 1 is not better than the other. Nevertheless, at that place are some very important differences betwixt the 2 commands that yous and your squad should take into consideration.

Whenever git merge is run, an extra merge commit is created. Whenever you are working in your local repository, having too many merge commits can make the commit history look confusing. One manner to avert the merge commit is to apply git rebase instead.

git rebase is a very powerful feature. That existence said, it is risky as well if information technology is not used in the right style. git rebase alters the commit history, so utilise it with care. If rebasing is done in the remote repository, and so it tin can create a lot of problems when other developers endeavor to pull the latest lawmaking changes from the remote repository. Retrieve to only run git rebase in a local repository.

That'southward all you lot need to know to merge and rebase with the best of 'em.

Learn to lawmaking for free. freeCodeCamp'southward open up source curriculum has helped more than 40,000 people get jobs equally developers. Go started