diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-05-28 15:26:13 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-05-29 09:55:09 -0400 |
| commit | 885b94aac06f17c55bd6f8df318e0cffb0104efa (patch) | |
| tree | d5e0713a5868f230242db3a614eb08fd11ddbd95 /include/git2/errors.h | |
| parent | ff8d635adbf1208927c7319178d29b0ed973a107 (diff) | |
| download | libgit2-885b94aac06f17c55bd6f8df318e0cffb0104efa.tar.gz | |
Rename GIT_EMERGECONFLICT to GIT_ECONFLICT
We do not error on "merge conflicts"; on the contrary, merge conflicts
are a normal part of merging. We only error on "checkout conflicts",
where a change exists in the index or the working directory that would
otherwise be overwritten by performing the checkout.
This *may* happen during merge (after the production of the new index
that we're going to checkout) but it could happen during any checkout.
Diffstat (limited to 'include/git2/errors.h')
| -rw-r--r-- | include/git2/errors.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/git2/errors.h b/include/git2/errors.h index 31fc6035a..dda0f8a57 100644 --- a/include/git2/errors.h +++ b/include/git2/errors.h @@ -38,7 +38,7 @@ typedef enum { GIT_EUNMERGED = -10, /**< Merge in progress prevented operation */ GIT_ENONFASTFORWARD = -11, /**< Reference was not fast-forwardable */ GIT_EINVALIDSPEC = -12, /**< Name/ref spec was not in a valid format */ - GIT_EMERGECONFLICT = -13, /**< Merge conflicts prevented operation */ + GIT_ECONFLICT = -13, /**< Checkout conflicts prevented operation */ GIT_ELOCKED = -14, /**< Lock file prevented operation */ GIT_EMODIFIED = -15, /**< Reference value does not match expected */ GIT_EAUTH = -16, /**< Authentication error */ |