diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-02 16:32:45 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-03 14:40:38 +0100 |
| commit | 378f8a97aacfa23fdce8af07719077040f870ee5 (patch) | |
| tree | 933706ead0325609fdef8bfe8a1e618d247227c1 /tests.branching/merge-conflict-chunks.stdout | |
| parent | 9c2ccea87da3809082a1fa392611cc5294f717fe (diff) | |
| download | morph-378f8a97aacfa23fdce8af07719077040f870ee5.tar.gz | |
morph merge: Rework how we interact with git
Upsides:
- clearer error messages on conflicts (we no longer dump the git
output)
- merge base is available during morphology merging
- we no longer need to go through the complexity of implementing a
git merge driver
We now manually fetch and then merge, instead of using git pull. This
is not strictly necessary, but it makes it clearer in the code how
FETCH_HEAD is involved in the process.
Diffstat (limited to 'tests.branching/merge-conflict-chunks.stdout')
| -rw-r--r-- | tests.branching/merge-conflict-chunks.stdout | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/tests.branching/merge-conflict-chunks.stdout b/tests.branching/merge-conflict-chunks.stdout index 75d50c7f..bf6d3828 100644 --- a/tests.branching/merge-conflict-chunks.stdout +++ b/tests.branching/merge-conflict-chunks.stdout @@ -1,10 +1,4 @@ -Merge errors encountered in baserock:stratum2-hello, branch test/stable: -Auto-merging conflict.txt -CONFLICT (add/add): Merge conflict in conflict.txt -Automatic merge failed; fix conflicts and then commit the result. - -Merge errors encountered in baserock:stratum3-hello, branch test/stable: -Auto-merging conflict.txt -CONFLICT (add/add): Merge conflict in conflict.txt -Automatic merge failed; fix conflicts and then commit the result. - +Merge conflicts in baserock:stratum2-hello: + conflict.txt +Merge conflicts in baserock:stratum3-hello: + conflict.txt |