Rename GIT_EMERGECONFLICT to GIT_ECONFLICT #3163
Conversation
|
This has bothered me for a long-ass time, I was always shy about fixing it because I didn't want to break API compatibility. We've been doing a lot of that lately, though, so what the heck, let's name this correctly lest people assume that our name indicates something that it doesn't. |
|
We do error out if we are asked to perform a checkout when there are conflicts in the index so I think the error doc should still mention them, but I do like the change. Can we get some CHANGELOG love? |
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.
|
You and your slavish adherence to the CHANGELOG. Telling users when we've broken them and all that. |
😍 Thank you for keeping this in mind as part of the code review. I actually find the changelog quite useful, so this attention is appreciated. |
👍 I've been bad about this lately. (Sorry.) So thanks be to @carlosmn for keeping me honest. (I updated this PR by the way.) |
|
If I don't keep it in mind now, one of us is going to have to put it into the chanelog before the release anyway, so :) |
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.