merge


Description:

public void merge (AnnotatedCommit[] their_heads, MergeOptions merge_opts, CheckoutOptions checkout_opts) throws Error

Merges the given commit(s) into HEAD, writing the results into the working directory.

Any changes are staged for commit and any conflicts are written to the index.

Callers should inspect the repository's index after this completes, resolve any conflicts and prepare a commit.

Parameters:

this

a Repository.

their_heads

the heads to merge into

merge_opts

merge options

checkout_opts

checkout options

their_heads_length

the length of their_heads