DescribeMergeConflictsInput

public struct DescribeMergeConflictsInput : AWSShape
extension CodeCommit.DescribeMergeConflictsInput: AWSPaginateStringToken

Undocumented

  • Declaration

    Swift

    public static var _members: [AWSShapeMember]
  • 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.

    Declaration

    Swift

    public let conflictDetailLevel: ConflictDetailLevelTypeEnum?
  • 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.

    Declaration

    Swift

    public let conflictResolutionStrategy: ConflictResolutionStrategyTypeEnum?
  • The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

    Declaration

    Swift

    public let destinationCommitSpecifier: String
  • The path of the target files used to describe the conflicts.

    Declaration

    Swift

    public let filePath: String
  • The maximum number of merge hunks to include in the output.

    Declaration

    Swift

    public let maxMergeHunks: Int?
  • The merge option or strategy you want to use to merge the code.

    Declaration

    Swift

    public let mergeOption: MergeOptionTypeEnum
  • An enumeration token that, when provided in a request, returns the next batch of the results.

    Declaration

    Swift

    public let nextToken: String?
  • The name of the repository where you want to get information about a merge conflict.

    Declaration

    Swift

    public let repositoryName: String
  • The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

    Declaration

    Swift

    public let sourceCommitSpecifier: String
  • Undocumented

    Declaration

    Swift

    public init(conflictDetailLevel: ConflictDetailLevelTypeEnum? = nil, conflictResolutionStrategy: ConflictResolutionStrategyTypeEnum? = nil, destinationCommitSpecifier: String, filePath: String, maxMergeHunks: Int? = nil, mergeOption: MergeOptionTypeEnum, nextToken: String? = nil, repositoryName: String, sourceCommitSpecifier: String)
  • Declaration

    Swift

    public func validate(name: String) throws