Merge branch 'jc/t3404-one-shot-export-fix'

diff --git a/unpack-trees.c b/unpack-trees.c
index 66741130aeddaec7a913264fb41ef82d87d9b504..cd0680f11e3580ef24e9140dd00a1e38f02557d8 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1247,7 +1247,7 @@ static void mark_new_skip_worktree(struct exclude_list *el,
                if (select_flag && !(ce->ce_flags & select_flag))
                        continue;
 
-               if (!ce_stage(ce))
+               if (!ce_stage(ce) && !(ce->ce_flags & CE_CONFLICTED))
                        ce->ce_flags |= skip_wt_flag;
                else
                        ce->ce_flags &= ~skip_wt_flag;