Wiclear

TLA_MERGE

Thursday, 28. December 2006 22:05:05, by David Jobet

 

When working with other people's branch, we want to merge their changes into our branch.

tla replay

Replay a patch from another branch and apply it to local branch.

 $> tla replay steve@wiclear--2006-wiclear/wiclear--cv--0.10

ou

 $> tla replay steve@wiclear--2006-wiclear/wiclear--cv--0.10--patch-10

tla star merge

 $> tla star-merge steve@wiclear--2006-wiclear/wiclear--cv--0.10

ou

 $> tla star-merge steve@wiclear--2006-wiclear/wiclear--cv--0.10--patch-10

Differences

Replay will apply each patch one by one 'mechanically', without trying to avoid fake conflicts caused by the two branches having been merged previously. Star-merge tracks the branch merging history to avoid those fake conflicts.