/AWS1/CL_CMT=>MERGEBRANCHESBYTHREEWAY()¶
About MergeBranchesByThreeWay¶
Merges two specified branches using the three-way merge strategy.
Method Signature¶
IMPORTING¶
Required arguments:¶
IV_REPOSITORYNAME TYPE /AWS1/CMTREPOSITORYNAME /AWS1/CMTREPOSITORYNAME¶
The name of the repository where you want to merge two branches.
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_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).
Optional arguments:¶
IV_TARGETBRANCH TYPE /AWS1/CMTBRANCHNAME /AWS1/CMTBRANCHNAME¶
The branch where the merge is applied.
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_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_AUTHORNAME TYPE /AWS1/CMTNAME /AWS1/CMTNAME¶
The name of the author who created the commit. This information is used as both the author and committer for the commit.
IV_EMAIL TYPE /AWS1/CMTEMAIL /AWS1/CMTEMAIL¶
The email address of the person merging the branches. This information is used in the commit information for the merge.
IV_COMMITMESSAGE TYPE /AWS1/CMTMESSAGE /AWS1/CMTMESSAGE¶
The commit message to include in the commit information for the merge.
IV_KEEPEMPTYFOLDERS TYPE /AWS1/CMTKEEPEMPTYFOLDERS /AWS1/CMTKEEPEMPTYFOLDERS¶
If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If true, a .gitkeep file is created for empty folders. The default is false.
IO_CONFLICTRESOLUTION TYPE REF TO /AWS1/CL_CMTCONFLICTRESOLUTION /AWS1/CL_CMTCONFLICTRESOLUTION¶
If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.