diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-07-04 15:13:11 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-06 14:45:26 -0700 |
| commit | 327ac9cb9dda3ef8be5cc66a01daa32c6e8c8639 (patch) | |
| tree | c803c1bbcc5d7b86b7028e8753d8ac20ba6711bc /branch.c | |
| parent | Second batch for 2.19 cycle (diff) | |
| download | tgif-327ac9cb9dda3ef8be5cc66a01daa32c6e8c8639.tar.xz | |
t6036: add lots of detail for directory/file conflicts in recursive case
There was a discussion of problematic directory/file conflicts with
virtual merge bases on the mailing list years ago at
https://public-inbox.org/git/AANLkTimwUQafGDrjxWrfU9uY1uKoFLJhxYs=vssOPqdf@mail.gmail.com/
Part of these corresponding tests made it into this testsuite. However,
the more problematic one didn't. And there are others that showcase the
problems even more. Add a very lengthy explanation, some of it from that
email, describing the tradeoffs in picking a recursive merge-base when
you're dealing with an add/add directory/file conflict.
The solution picked years ago is relatively good, but there is the
potential to do even better, assuming we're willing to pay a certain
performance cost.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'branch.c')
0 files changed, 0 insertions, 0 deletions