diff options
author | Elijah Newren <newren@gmail.com> | 2021-03-20 00:03:50 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-03-20 12:35:40 -0700 |
commit | 66b209b86ad3b79728d3f0f22e1bdef6b17a12c1 (patch) | |
tree | 64a00b23586ed5a9957be46541dcc966a5175fbf /protocol.h | |
parent | t6428: new test for SKIP_WORKTREE handling and conflicts (diff) | |
download | tgif-66b209b86ad3b79728d3f0f22e1bdef6b17a12c1.tar.xz |
merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries
When merge conflicts occur in paths removed by a sparse-checkout, we
need to unsparsify those paths (clear the SKIP_WORKTREE bit), and write
out the conflicted file to the working copy. In the very unlikely case
that someone manually put a file into the working copy at the location
of the SKIP_WORKTREE file, we need to avoid overwriting whatever edits
they have made and move that file to a different location first.
Signed-off-by: Elijah Newren <newren@gmail.com>
Reviewed-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'protocol.h')
0 files changed, 0 insertions, 0 deletions