thodg/libgit2/tests/stash

Diff

  • Show log

    Commit

  • Hash : 885b94aa
    Author : Edward Thomson
    Date : 2015-05-28T15:26:13 

    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.

kmx.io     mail     discord kmxgit v0.4.0