/AWS1/CL_CMT=>GETMERGECONFLICTS()¶
About GetMergeConflicts¶
Returns information about merge conflicts between the before and after commit IDs for a pull request in a repository.
Method Signature¶
IMPORTING¶
Required arguments:¶
IV_REPOSITORYNAME TYPE /AWS1/CMTREPOSITORYNAME /AWS1/CMTREPOSITORYNAME¶
The name of the repository where the pull request was created.
IV_DSTCOMMITSPECIFIER TYPE /AWS1/CMTCOMMITNAME /AWS1/CMTCOMMITNAME¶
The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).
IV_SOURCECOMMITSPECIFIER TYPE /AWS1/CMTCOMMITNAME /AWS1/CMTCOMMITNAME¶
The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).
IV_MERGEOPTION TYPE /AWS1/CMTMERGEOPTIONTYPEENUM /AWS1/CMTMERGEOPTIONTYPEENUM¶
The merge option or strategy you want to use to merge the code.
Optional arguments:¶
IV_CONFLICTDETAILLEVEL TYPE /AWS1/CMTCONFLICTDETLEVELTYP00 /AWS1/CMTCONFLICTDETLEVELTYP00¶
The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.
IV_MAXCONFLICTFILES TYPE /AWS1/CMTMAXRESULTS /AWS1/CMTMAXRESULTS¶
The maximum number of files to include in the output.
IV_CONFLICTRESOLUTIONSTRAG TYPE /AWS1/CMTCONFLICTRESOLUTIONS00 /AWS1/CMTCONFLICTRESOLUTIONS00¶
Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.
IV_NEXTTOKEN TYPE /AWS1/CMTNEXTTOKEN /AWS1/CMTNEXTTOKEN¶
An enumeration token that, when provided in a request, returns the next batch of the results.