From ecd60a56ebd6bdc347a486f53da7de0febef58cf Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Thu, 14 May 2015 11:52:48 -0400 Subject: conflicts: when adding conflicts, remove staged When adding a conflict for some path, remove the staged entry. Otherwise, an illegal index (with both stage 0 and high-stage entries) would result. --- include/git2/index.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/git2') diff --git a/include/git2/index.h b/include/git2/index.h index 52032f7fd..1e1d5e748 100644 --- a/include/git2/index.h +++ b/include/git2/index.h @@ -631,7 +631,8 @@ GIT_EXTERN(int) git_index_find(size_t *at_pos, git_index *index, const char *pat /**@{*/ /** - * Add or update index entries to represent a conflict + * Add or update index entries to represent a conflict. Any staged + * entries that exist at the given paths will be removed. * * The entries are the entries from the tree included in the merge. Any * entry may be null to indicate that that file was not present in the -- cgit v1.2.1