Merge branch 'mk/merge-in-sparse-checkout'
[git/git.git] / unpack-trees.c
index 6674113..cd0680f 100644 (file)
@@ -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;