View on GitHub
Conflict Structure Reference
Conflict
public struct Conflict : AWSShapeUndocumented
-
Declaration
Swift
public static var _members: [AWSShapeMember] -
Metadata about a conflict in a merge operation.
Declaration
Swift
public let conflictMetadata: ConflictMetadata? -
A list of hunks that contain the differences between files or lines causing the conflict.
Declaration
Swift
public let mergeHunks: [MergeHunk]? -
Undocumented
Declaration
Swift
public init(conflictMetadata: ConflictMetadata? = nil, mergeHunks: [MergeHunk]? = nil)