diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-01-01 02:34:48 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-01-04 10:40:45 -0800 |
| commit | 4ef88fc3a8d402de272c6bfa36538bd8e4cdd439 (patch) | |
| tree | 431e4c8602c8792d406eaa2b0ae45ecc5e65dbab /t/t4034 | |
| parent | merge-ort: copy find_first_merges() implementation from merge-recursive.c (diff) | |
| download | tgif-4ef88fc3a8d402de272c6bfa36538bd8e4cdd439.tar.xz | |
merge-ort: add handling for different types of files at same path
Add some handling that explicitly considers collisions of the following
types:
* file/submodule
* file/symlink
* submodule/symlink
Leaving them as conflicts at the same path are hard for users to
resolve, so move one or both of them aside so that they each get their
own path.
Note that in the case of recursive handling (i.e. call_depth > 0), we
can just use the merge base of the two merge bases as the merge result
much like we do with modify/delete conflicts, binary files, conflicting
submodule values, and so on.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4034')
0 files changed, 0 insertions, 0 deletions