mirror of
https://git.proxmox.com/git/libgit2
synced 2025-10-18 09:31:12 +00:00
885b94aac0
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. |
||
|---|---|---|
| .. | ||
| binaryunicode.c | ||
| checkout_helpers.c | ||
| checkout_helpers.h | ||
| conflict.c | ||
| crlf.c | ||
| head.c | ||
| icase.c | ||
| index.c | ||
| nasty.c | ||
| tree.c | ||
| typechange.c | ||