| |
| | Description of Trivial Merge Algorithm (Site not responding. Last check: 2007-10-23) |
 | | This algorithm is central to the submit process, in particular submit end, because the rules of submit end require that all merges to the baseline be trivial. |
 | | For any merge, there are three versions of interest: the FROM version (the source of the merge), the TO version (the destination of the merge), and the BASE version, which is the most recent version both the FROM and TO versions have in common--their "common ancestor", if you will. |
 | | In the case of merges both to and from a version, the only way to be sure that the merge is trivial is to determine the order of the merges. |
| www.paulandlesley.org /clearcase/t_merge.html (1406 words) |
|