{"componentChunkName":"component---src-pages-markdown-remark-fields-slug-js","path":"/engineering/git-rebase-vs-git-merge/","result":{"data":{"markdownRemark":{"id":"3a33f6f5-df0c-55f0-8d4e-c898e2a8cd12","excerpt":"Many of us have to choose between Merge and Rebase as a Developer. Here I'll explain what merge and rebase are, why you should use them, and how to do so. The…","html":"

Many of us have to choose between Merge and Rebase as a Developer. Here I'll explain what merge and rebase are, why you should use them, and how to do so.

\n

The same function is fulfilled by Git Merge and Git Rebase. They are built to incorporate adjustments into one from different divisions. Although the end objective is the same, it is done in various ways by those two approaches, and it is useful to know the difference as you become a better developer of software.

\n

What are Git Merge and Git Rebase?

\n

Git Merge and Git Rebase are both used to combine the changes of branches but in a distinct way.

\n

Git Merge - For developers using version control systems, merging is a prevalent method. Merging takes the contents of a source branch and combines them with a target branch, to be more precise. Only the target branch is updated in this process. The history of the source branch remains similar.

\n

Git Rebase - Another way to integrate modifications from one branch to another is by Rebase. Rebase compresses all the modifications into a single patch. The patch is then inserted into the target branch.

\n

Git Merge

\n

Combine multiple branch histories together.

\n
  A---B---C feature\n /\nD---E---F---G master
\n

if we are merging feature and master branch, then it would be

\n
  A---B---C feature\n /               \\\nD---E---F---G---H master
\n

Commands for merging feature and master branch

\n

git checkout feature\ngit merge master

\n

Note:

\n\n

Git Rebase

\n

Reapply commits on top of the base branch

\n
   A---B---C feature\n /\nD---E---F---G master
\n

if we are rebasing the feature branch onto the master branch, then it would be

\n
\t   A'--B'--C' feature\n\t /\n\tD---E---F---G master
\n

Commands for merging feature and master branch

\n

git checkout feature\ngit rebase master

\n

Note:

\n\n

When to use Git Rebase or Git Merge

\n

Choose Merge

\n\n

Choose Rebase

\n\n

Conclusion

\n

I hope some perspectives on Git merge and Git rebase have been provided by this description. The strategy of merge vs rebase is still debatable. But maybe this article will help to dispel your doubts and encourage you to take an approach that works for your team. Here are few articles posted by me that will help you in learning few more things in Git:

\n
    \n
  1. How to use Git Cherry Pick
    2. \n
  2. How to Perform a Git Force Pull
    3. \n
\n

Do comment on the subjects that you would like me to write about in the coming weeks :)

\n","headings":[{"value":"What are Git Merge and Git Rebase?","depth":2},{"value":"Git Merge","depth":3},{"value":"Git Rebase","depth":3},{"value":"When to use Git Rebase or Git Merge","depth":2},{"value":"Choose Merge","depth":3},{"value":"Choose Rebase","depth":3},{"value":"Conclusion","depth":3}],"fields":{"slug":"/engineering/git-rebase-vs-git-merge/"},"frontmatter":{"metatitle":null,"metadescription":null,"description":"In this post, I will give you a walkthrough on merge and rebase, comparing Git rebase vs. Git merge to find out the similarities and differences.","title":"Git merge vs. Git Rebase: What's the difference?","canonical":null,"date":"January 27, 2021","updated_date":null,"tags":["GIT"],"coverImage":{"childImageSharp":{"fluid":{"aspectRatio":1.5037593984962405,"src":"/static/23c891d4a8760d428bfc6f05aa86f387/2ad7f/merge.webp","srcSet":"/static/23c891d4a8760d428bfc6f05aa86f387/1c9b5/merge.webp 200w,\n/static/23c891d4a8760d428bfc6f05aa86f387/f1752/merge.webp 400w,\n/static/23c891d4a8760d428bfc6f05aa86f387/2ad7f/merge.webp 800w,\n/static/23c891d4a8760d428bfc6f05aa86f387/e7405/merge.webp 1200w","sizes":"(max-width: 800px) 100vw, 800px"}}},"author":{"id":"Abhimanyu Singh Rathore","github":"abhir9","bio":"He is a fun-loving technocrat, artist, photographer, nature lover, leisure traveler, and developer. He actively develops full-stack apps and programs in Go and various JavaScript frameworks and libraries, especially React.","avatar":null}}}},"pageContext":{"id":"3a33f6f5-df0c-55f0-8d4e-c898e2a8cd12","fields__slug":"/engineering/git-rebase-vs-git-merge/","__params":{"fields__slug":"engineering"}}},"staticQueryHashes":["1171199041","1384082988","1711371485","1753898100","2100481360","229320306","23180105","528864852"]}