From 629b661caab321a3aa5ffd7274ea4ed441d2805e Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Wed, 17 Jul 2013 09:49:56 -0500 Subject: checkout (from index) can write conflicts --- src/reset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/reset.c') diff --git a/src/reset.c b/src/reset.c index cea212a93..87dc45a3f 100644 --- a/src/reset.c +++ b/src/reset.c @@ -135,7 +135,7 @@ int git_reset( if (reset_type == GIT_RESET_HARD) { /* overwrite working directory with HEAD */ - opts.checkout_strategy = GIT_CHECKOUT_FORCE; + opts.checkout_strategy = GIT_CHECKOUT_FORCE | GIT_CHECKOUT_SKIP_UNMERGED; if ((error = git_checkout_tree(repo, (git_object *)tree, &opts)) < 0) goto cleanup; -- cgit v1.2.1