Re: [PATCH 2/2] merge-recursive: preserve skip_worktree bit when necessary

merge-recursive.c | 16 t/t3507-cherry-pick-conflict.sh | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/merge-recursive.c b/merge-recursive.c index 113c1d696..fd74bca17 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -3069,1

[PATCH 2/2] merge-recursive: preserve skip_worktree bit when necessary

merge-recursive takes any files marked as unmerged by unpack_trees, tries to figure out whether they can be resolved (e.g. using renames or a file-level merge), and then if they can be it will delete the old cache entries and writes new ones. This means that any ce_flags for those cache entries ar