diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-27 18:41:19 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-27 19:22:22 +0100 |
| commit | fcf40483bfab8c902ff5c09214a8ca768303eb98 (patch) | |
| tree | 3925d5a49bc64df7eef8782a364a3835bba4f7df /tests.branching | |
| parent | c821535c6290e47cabf85691b41d6b7dd20a7982 (diff) | |
| download | morph-fcf40483bfab8c902ff5c09214a8ca768303eb98.tar.gz | |
morph merge: Error message wrangling
These do need to be quite clear, because merge failures will happen a
lot and we are relatively unhelpful at the moment.
Diffstat (limited to 'tests.branching')
| -rw-r--r-- | tests.branching/merge-conflict-chunks.stderr | 2 | ||||
| -rw-r--r-- | tests.branching/merge-conflict-stratum.stderr | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests.branching/merge-conflict-chunks.stderr b/tests.branching/merge-conflict-chunks.stderr index 0bdc9475..9692d2ec 100644 --- a/tests.branching/merge-conflict-chunks.stderr +++ b/tests.branching/merge-conflict-chunks.stderr @@ -3,4 +3,4 @@ ERROR: merge errors were encountered in the following repositories: baserock:stratum2-hello baserock:stratum3-hello -Please manually merge the target ref into test/feature in each case, and then merge the system branch. +Please manually merge the target ref into test/feature in each case in the test/feature system branch, and then repeat the system branch merge. diff --git a/tests.branching/merge-conflict-stratum.stderr b/tests.branching/merge-conflict-stratum.stderr index 36781ad7..3a7c1522 100644 --- a/tests.branching/merge-conflict-stratum.stderr +++ b/tests.branching/merge-conflict-stratum.stderr @@ -1 +1 @@ -ERROR: Merging failed in baserock:morphs: please manually merge test/stable into test/feature in this repo and try again. +ERROR: Merging failed in baserock:morphs: please 'git merge' the latest test/stable into test/feature in the 'test/feature' system branch. |