equal
deleted
inserted
replaced
89 We begin by comparing two versions manifests and deciding which files |
89 We begin by comparing two versions manifests and deciding which files |
90 need to be added, deleted, and merged. |
90 need to be added, deleted, and merged. |
91 |
91 |
92 Then for each file, we perform a graph merge and resolve as above. |
92 Then for each file, we perform a graph merge and resolve as above. |
93 It's important to merge files using per-file DAGs rather than just |
93 It's important to merge files using per-file DAGs rather than just |
94 changeset level DAGs as this diagram illustrates: |
94 changeset level DAGs as this diagram illustrates: |
95 |
95 |
96 M M1 M2 |
96 M M1 M2 |
97 |
97 |
98 AB |
98 AB |
99 |`-------v M2 clones M |
99 |`-------v M2 clones M |