merge_commits


Description:

public Index? merge_commits (Commit our_commit, Commit their_commit, MergeOptions merge_options) throws Error

Merge two commits creating a Index reflecting the result of the merge.

Parameters:

this

a Repository.

our_commit

the commit that reflects the destination tree.

their_commit

the commit that reflects the source tree.

merge_options

the merge options.

Returns:

a new Index or null if an error occurred.