diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-11-20 17:33:49 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-11-25 15:38:39 -0500 |
| commit | 78859c63442bb367a4d426ec8ee31c82a28a93d7 (patch) | |
| tree | 75a5bc0e2ccfd8d0dda419afdb906db3e866ee0a /tests/resources/merge-recursive/.gitted/objects/6c | |
| parent | 34a51428a121800509c2bea94137a17802e37982 (diff) | |
| download | libgit2-78859c63442bb367a4d426ec8ee31c82a28a93d7.tar.gz | |
merge: handle conflicts in recursive base building
When building a recursive merge base, allow conflicts to occur.
Use the file (with conflict markers) as the common ancestor.
The user has already seen and dealt with this conflict by virtue
of having a criss-cross merge. If they resolved this conflict
identically in both branches, then there will be no conflict in the
result. This is the best case scenario.
If they did not resolve the conflict identically in the two branches,
then we will generate a new conflict. If the user is simply using
standard conflict output then the results will be fairly sensible.
But if the user is using a mergetool or using diff3 output, then the
common ancestor will be a conflict file (itself with diff3 output,
haha!). This is quite terrible, but it matches git's behavior.
Diffstat (limited to 'tests/resources/merge-recursive/.gitted/objects/6c')
| -rw-r--r-- | tests/resources/merge-recursive/.gitted/objects/6c/778edd0e4cf394f5a3df8b96db516024cc1bb8 | bin | 0 -> 636 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/resources/merge-recursive/.gitted/objects/6c/778edd0e4cf394f5a3df8b96db516024cc1bb8 b/tests/resources/merge-recursive/.gitted/objects/6c/778edd0e4cf394f5a3df8b96db516024cc1bb8 Binary files differnew file mode 100644 index 000000000..ec1db19e6 --- /dev/null +++ b/tests/resources/merge-recursive/.gitted/objects/6c/778edd0e4cf394f5a3df8b96db516024cc1bb8 |