diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-01-01 02:34:39 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-01-04 10:40:45 -0800 |
| commit | 0ccfa4e5d8489abe7c5d3fe29b68e4fe0cae6fe1 (patch) | |
| tree | 7ff5c7ba2b9910609f1ed191449fe75dcb7b4204 /t/t3408-rebase-multi-line.sh | |
| parent | merge-ort: add modify/delete handling and delayed output processing (diff) | |
| download | tgif-0ccfa4e5d8489abe7c5d3fe29b68e4fe0cae6fe1.tar.xz | |
merge-ort: handle D/F conflict where directory disappears due to merge
When one side has a directory at a given path and the other side of
history has a file at the path, but the merge resolves the directory
away (e.g. because no path within that directory was modified and the
other side deleted it, or because renaming moved all the files
elsewhere), then we don't actually have a conflict anymore. We just
need to clear away any information related to the relevant directory,
and then the subsequent process_entry() handling can handle the given
path.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3408-rebase-multi-line.sh')
0 files changed, 0 insertions, 0 deletions