Linux------Git-5

Source: Internet
Author: User
5. The basic logic of the branching 5.1-yan

The merge operation, as shown, merges two pointer states.

Rebase is also the Yan-he:

Principle: Looking for the common ancestor of two branches, according to the current branch is now checkout state branch, relative to the common ancestor after the successive submissions to generate a series of patch files, such as starting from a common ancestor file, submitted 10 times, then will generate 10 patch files, then use Git Rebase Master for the rebase, where master is the base branch, the Rebase will be based on its last commit object as a new starting point, and then to prepare the patch file, a dozen, eventually generated a new object, this object is the direct downstream of master.

At this point, if checkout master, then the merge operation, will be fast-forward, because already on the same line.

Linux------Git-5

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.