libgit2

git_index_conflict_add

Version:

Add or update index entries to represent a conflict

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 trees during the merge. For example, ancestor_entry may be NULL to indicate that a file was added in both branches and must be resolved.

Signature

GitHub
int git_index_conflict_add(git_index *index, const git_index_entry *ancestor_entry, const git_index_entry *our_entry, const git_index_entry *their_entry);

Parameters

git_index *
In
index

an existing index object

const git_index_entry *
In
ancestor_entry

the entry data for the ancestor of the conflict

const git_index_entry *
In
our_entry

the entry data for our side of the merge conflict

const git_index_entry *
In
their_entry

the entry data for their side of the merge conflict

Returns

int

0 or an error code

Versions