libgit2

git_index_conflict_next

Version:

Returns the current conflict (ancestor, ours and theirs entry) and advance the iterator internally to the next value.

Signature

GitHub
int git_index_conflict_next(const git_index_entry **ancestor_out, const git_index_entry **our_out, const git_index_entry **their_out, git_index_conflict_iterator *iterator);

Parameters

const git_index_entry **
In
ancestor_out

Pointer to store the ancestor side of the conflict

const git_index_entry **
In
our_out

Pointer to store our side of the conflict

const git_index_entry **
In
their_out

Pointer to store their side of the conflict

git_index_conflict_iterator *
In
iterator

The conflict iterator.

Returns

int

0 (no error), GIT_ITEROVER (iteration is done) or an error code (negative value)

Versions