ListConflictFiles
Lists all files with conflicts between two commits.Request
The repository to check for conflicts
The OID of the local commit
The OID of the remote commit to merge
If true, the request will not fail when tree conflicts are present. Responses may contain conflict files where some paths are unset.
Response (Stream)
Array of conflict files
ConflictFile
Each ConflictFile contains either a header or content:Metadata about the conflicting file
Chunk of file content with conflict markers
ConflictFileHeader
Commit OID where the conflict was detected
Path in their branch
Path in our branch
File mode in our branch
Path in the common ancestor
ResolveConflicts
Attempts to resolve conflicts with user-provided merge resolutions. If successful, creates a new merge commit.Request (Stream)
The first message must contain the header, followed by messages containing the files JSON data.Header (First Message)
The repository where conflicts will be resolved and where source_branch will be updated
The OID of the local commit
The repository from which their_commit_oid will be retrieved
The OID of the remote commit to merge into the local commit
The branch on which the new merge commit will be created
The branch to fetch from target_repository if their_commit_oid doesn’t exist in repository
The commit message for the newly created merge commit
The user to set as author and committer of the merge commit
Optional timestamp to use as the committer date. If not set, the current time is used.
Subsequent Messages
JSON-encoded list of conflict resolutions
Response
Description of why conflict resolution failed. Empty if successful. Check this field to verify whether the merge commit was correctly created.