diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-26 16:51:44 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-27 19:36:56 +0100 |
| commit | 48ff511df6f175e27ca365f644eac60875e09c94 (patch) | |
| tree | f2cba0a335a642c3c0ac4b38a68c611de03c777f /tests.branching/show-system-branch-fails-outside-workspace.exit | |
| parent | 3b0a4d7346cef0091b00ad0cc6610476fdea61d1 (diff) | |
| download | morph-48ff511df6f175e27ca365f644eac60875e09c94.tar.gz | |
morph merge: Use a special git merge driver for morphology files
We now have a two-stage merge process. Stage one only runs if there
are changes in both branches on the same file. At the end of stage
one we assume that all the components that were edited in the FROM
branch still have their 'ref' field set to the FROM branch. Morph
then iterates through these repositories, performing a merge in each
one, and then updates the refs in the morphologies again with the
correct target branches.
Diffstat (limited to 'tests.branching/show-system-branch-fails-outside-workspace.exit')
0 files changed, 0 insertions, 0 deletions