git rebase and merge differences and application scenarios

Source: Internet
Author: User

There is no difference between rebase and merge for two branches, but rebase is cleaner because log hisitory is linear, but a commit is not necessarily sorted by date, but a local commit is always behind. History becomes more complex after the merge, but the commit is sorted by date, and the StackOverflow has a good illustration:

Http://stackoverflow.com/questions/16666089/whats-the-difference-between-git-merge-and-git-rebase

This blog says that the applicable scenario is that the product OEM retains the branch for rebase, and the functional branch is merged into the main branch with the merge.

http://blog.csdn.net/rryqsh/article/details/8230560

Contact Us

The content source of this page is from Internet, which doesn't represent Alibaba Cloud's opinion; products and services mentioned on that page don't have any relationship with Alibaba Cloud. If the content of the page makes you feel confusing, please write us an email, we will handle the problem within 5 days after receiving your email.

If you find any instances of plagiarism from the community, please send an email to: info-contact@alibabacloud.com and provide relevant evidence. A staff member will contact you within 5 working days.

A Free Trial That Lets You Build Big!

Start building with 50+ products and up to 12 months usage for Elastic Compute Service

  • Sales Support

    1 on 1 presale consultation

  • After-Sales Support

    24/7 Technical Support 6 Free Tickets per Quarter Faster Response

  • Alibaba Cloud offers highly flexible support services tailored to meet your exact needs.