Git: difference between Merge and Rebase

Git also supports merge between the branches. However in a bit different way. There are two type of merge

GIT Merge

Let’s talk about the merge. Like in any source control system, in Git you can merge two branches in below fashion. Here H commit becomes the new merge commit. Similar to SVN or TFS.

GIT Rebase

It is process of maintaining linear history. if you are on master branch and do a git rebase development then below will happen.

If both the branches contain same commit then the branch having commit before in timeline will be kept and other will not be considered.

 

One thought on “Git: difference between Merge and Rebase

Leave a Reply

Your email address will not be published. Required fields are marked *