Skip to content

GetMergeConflictsInput

Source code in docs_src/capo_codecommit/types/get_merge_conflicts_input.py
class GetMergeConflictsInput(TypedDict, closed=True):
    repository_name: "capo_codecommit.types.repository_name.RepositoryName"
    """<p>The name of the repository where the pull request was created.</p>"""
    destination_commit_specifier: "capo_codecommit.types.commit_name.CommitName"
    """<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).</p>"""
    source_commit_specifier: "capo_codecommit.types.commit_name.CommitName"
    """<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).</p>"""
    merge_option: "capo_codecommit.types.merge_option_type_enum.MergeOptionTypeEnum"
    """<p>The merge option or strategy you want to use to merge the code. </p>"""
    conflict_detail_level: NotRequired[
        "capo_codecommit.types.conflict_detail_level_type_enum.ConflictDetailLevelTypeEnum"
    ]
    """<p>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.</p>"""
    max_conflict_files: NotRequired["capo_codecommit.types.max_results.MaxResults"]
    """<p>The maximum number of files to include in the output.</p>"""
    conflict_resolution_strategy: NotRequired[
        "capo_codecommit.types.conflict_resolution_strategy_type_enum.ConflictResolutionStrategyTypeEnum"
    ]
    """<p>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.</p>"""
    next_token: NotRequired["capo_codecommit.types.next_token.NextToken"]
    """<p>An enumeration token that, when provided in a request, returns the next batch of the results.</p>"""

conflict_detail_level instance-attribute

conflict_detail_level: NotRequired[ConflictDetailLevelTypeEnum]

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.

conflict_resolution_strategy instance-attribute

conflict_resolution_strategy: NotRequired[ConflictResolutionStrategyTypeEnum]

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.

destination_commit_specifier instance-attribute

destination_commit_specifier: CommitName

The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

max_conflict_files instance-attribute

max_conflict_files: NotRequired[MaxResults]

The maximum number of files to include in the output.

merge_option instance-attribute

merge_option: MergeOptionTypeEnum

The merge option or strategy you want to use to merge the code.

next_token instance-attribute

next_token: NotRequired[NextToken]

An enumeration token that, when provided in a request, returns the next batch of the results.

repository_name instance-attribute

repository_name: RepositoryName

The name of the repository where the pull request was created.

source_commit_specifier instance-attribute

source_commit_specifier: CommitName

The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).