diff options
| -rw-r--r-- | src/apply.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/apply.c b/src/apply.c index fd1d5335a..1a20278c3 100644 --- a/src/apply.c +++ b/src/apply.c @@ -539,6 +539,13 @@ static int git_apply__to_workdir( error = git_checkout_index(repo, postimage, &checkout_opts); + /* + * When there's a checkout conflict, the file in the working directory + * has been modified. Upgrade this error to an application error. + */ + if (error == GIT_ECONFLICT) + error = GIT_EAPPLYFAIL; + done: git_vector_free(&paths); return error; |