DevOps Articles

GIT Merge vs Rebase - How and When?

Both GIT commands are used for the copy of onebranch into anotherbranch. But both used different approaches.

Rebase commit logs If you notice, In the merge has an additional commit “Merge branch master -> feature”.

Because of that, Since rebase is rewriting the commit, we can modify the commit(s) list while rebasing which you can not do in the merge.

It is good to use rebase whenever you want the streamline the history and flexibility to notify the history such as feature branch.