diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-01-01 02:34:40 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-01-04 10:40:45 -0800 |
| commit | 23366d2aa97544fe76bc86964f4493b7b89e7b22 (patch) | |
| tree | 60e49a337ecd131645e4c0fc90da37a62357b7ea /Documentation/git-checkout.txt | |
| parent | merge-ort: handle D/F conflict where directory disappears due to merge (diff) | |
| download | tgif-23366d2aa97544fe76bc86964f4493b7b89e7b22.tar.xz | |
merge-ort: handle directory/file conflicts that remain
When a directory/file conflict remains, we can leave the directory where
it is, but need to move the information about the file to a different
pathname. After moving the file to a different pathname, we allow
subsequent process_entry() logic to handle any additional details that
might be relevant.
This depends on a new helper function, unique_path(), that dies with an
unimplemented error currently but will be implemented in a subsequent
commit.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-checkout.txt')
0 files changed, 0 insertions, 0 deletions