Merge will take two commits and attempt to produce a commit that includes the changes that were made in both branches.
The file inputs to git_merge_file git_merge_file_input structure with descriptions of the files in each side of the conflict for use in producing the merge file.
Options for merging a file
Information about file-level merging
Merging options
Current version for the git_merge_file_input_options structure
Static constructor for git_merge_file_input_options
Default size for conflict markers
Current version for the git_merge_file_options structure
Static constructor for git_merge_file_options
Current version for the git_merge_options structure
Static constructor for git_merge_options
Flags for git_merge options passed in via the flags value in the git_merge_options.
Merge file favor options for git_merge_options instruct the file-level merging functionality how to deal with conflicting regions of the files
File merging flags
The results of git_merge_analysis indicate the merge opportunities
The user's stated preference for merges
Initializes a git_merge_file_input with default values creating an instance with GIT_MERGE_FILE_INPUT_INIT.
Initialize git_merge_file_options structure
Initialize git_merge_options structure
Analyzes the given branch(es) and determines the opportunities for merging them into the HEAD of the repository
Analyzes the given branch(es) and determines the opportunities for merging them into a reference
Find a merge base between two commits
Find merge bases between two commits
Find a merge base given a list of commits
Find all merge bases given a list of commits
Find a merge base in preparation for an octopus merge
Merge two files as they exist in the in-memory data structures, using the given common ancestor as the baseline, producing a git_merge_file_result that reflects the merge result git_merge_file_result must be freed with git_merge_file_result_free.
Merge two files as they exist in the index, using the given common ancestor as the baseline, producing a git_merge_file_result that reflects the merge result git_merge_file_result_free.
Merge two trees, producing a git_index that reflects the result of the merge or checked out. If the index is to be converted to a tree, the caller should resolve any conflicts that arose as part of the merge.
Merge two commits, producing a git_index that reflects the result of the merge or checked out. If the index is to be converted to a tree, the caller should resolve any conflicts that arose as part of the merge.
Merges the given commit(s) into HEAD, writing the results into the working directory to the index. Callers should inspect the repository's index after this completes, resolve any conflicts and prepare a commit.