1 / 1

myprog.c

3. 2. 1. 0. Simple merge between element versions on two different branches. myprog.c. /main. base contributor – common ancestor of the target distributor and other contributors. A reference version to which other contributors are compared. 0. 2. 1. branching. base

oria
Télécharger la présentation

myprog.c

An Image/Link below is provided (as is) to download presentation Download Policy: Content on the Website is provided to you AS IS for your information and personal use and may not be sold / licensed / shared on other websites without getting consent from its author. Content is provided to you AS IS for your information and personal use only. Download presentation by click this link. While downloading, if for some reason you are not able to download a presentation, the publisher may have deleted the file from their server. During download, if you can't get a presentation, the file might be deleted by the publisher.

E N D

Presentation Transcript

  1. 3 2 1 0 Simple merge between element versions on two different branches myprog.c /main base contributor – common ancestor of the target distributor and other contributors. A reference version to which other contributors are compared. 0 2 1 branching base contributor 2 target contributor – LATEST version on main branch that will be checked out and merged with other contributors. After checking in it will contain the LASTEST+1 reconciled new version on main branch. /main/koolapp_2.3.5 3 9 4 5 merge result -- final result of merging is checked in as version 10 on the main branch. 10 6 7 temp file resulting from collecting differences. It will became LATEST+1 version one of the contributors 8 4 file resulting from the merge target contributor LATEST check out 9 one of the contributors (you may have up to 15) from some sub-branch (/main/koolapp_2.3.5) merging 4 merge result (LATEST+1) 10 check in

More Related