git_index_reuc_add

Adds a resolve undo entry for a file based on the given parameters.

The resolve undo entry contains the OIDs of files that were involved in a merge conflict after the conflict has been resolved. This allows conflicts to be re-resolved later.

If there exists a resolve undo entry for the given path in the index, it will be removed.

This method will fail in bare index instances.

package extern (C) nothrow @nogc

int

git_index_reuc_add

(

libgit2_d.types.git_index* index

const(char)* path

int ancestor_mode

const(libgit2_d.oid.git_oid)* ancestor_id

int our_mode

const(libgit2_d.oid.git_oid)* our_id

int their_mode

const(libgit2_d.oid.git_oid)* their_id

)

Parameters

index libgit2_d.types.git_index*: an existing index object
path const(char)*: filename to add
ancestor_mode int: mode of the ancestor file
ancestor_id const(libgit2_d.oid.git_oid)*: oid of the ancestor file
our_mode int: mode of our file
our_id const(libgit2_d.oid.git_oid)*: oid of our file
their_mode int: mode of their file
their_id const(libgit2_d.oid.git_oid)*: oid of their file

Return Value

Type: int

0 or an error code

git_index_reuc_add

Parameters

Return Value

Meta

Source