PDF Archive

Easily share your PDF documents with your contacts, on the Web and Social Networks.

Share a file Manage my documents Convert Recover PDF Search Help Contact



SafeWayToDoBM .pdf



Original filename: SafeWayToDoBM.pdf
Title: SafeWayToDoBM
Author: scutiero

This PDF 1.4 document has been generated by PDFCreator Version 1.6.0 / GPL Ghostscript 9.06, and has been sent on pdf-archive.com on 05/12/2016 at 10:02, from IP address 213.156.x.x. The current document download page has been viewed 221 times.
File size: 34 KB (5 pages).
Privacy: public file




Download original PDF file









Document preview


AS IS

Branch [AA]
Branch [AB]

Branch [A]
Now
The branch [A] has 10 Changes.
The branch [AA] is branched from [A2] (branch [A] change [2]) and has 8 changes
The branch [AB] is branched from [A4] and has 10 changes.
Note ( each is a changeset)

Step 1 - F.I. from [A] (change [4]) to [AA]
solving all the conflict.
(the logic say to me that after this [AA] == [A][4] + 8 changes)

Branch [AA]

FI: [A] (chn 4) -> [AA]
Branch [AB]

Branch [A]
Now
The branch [A] has 10 Changes.
The branch [AA] = [A4] + 8 changes
The branch [AB] is branched from [A4] and has 10 changes.
Note ( each is a changeset)

Step 2 - Branch [ABA] from [AB1]

Create Branch [ABA] (From AB chn 1)
Branch [AA]

Branch [AB]

Branch [A]
Now
The branch [A] has 10 Changes.
The branch [AA] = [A4] + 8 changes
The branch [AB] is branched from [A4] and has 10 changes.
Note ( each is a changeset)

Step 3 – Baseless Merge
AA (last changeset) to ABA taking all [AA] file on confict
(Now the Branch ABA == AA)

Branch [ABA]

BM: [AA] (last chn) -> [ABA]

Branch [AA]

Branch [AB]

Branch [A]
Now
The branch [A] has 10 Changes.
The branch [AA] = [A4] + 8 changes
The branch [AB] is branched from [A4] and has 10 changes.
Note ( each is a changeset)

Step 4 – F.I. from [AB] to [ABA]

Branch [ABA]
FI: [AB] (last chn) -> [ABA]
Branch [AA]

Branch [AB]

Branch [A]
Now
The branch [A] has 10 Changes.
The branch [AA] = [A4] + 8 changes
The branch [AB] is branched from [A4] and has 10 changes.
Note ( each is a changeset)


Related documents


safewaytodobm
git commands
git cheatsheet en dark
dialectical logic
my resume pdf
tfs hosting


Related keywords