interface GitResolutionMergeContent {
    author?: IdentityRef;
    mergeType?: GitResolutionMergeType;
    userMergedBlob?: GitBlobRef;
    userMergedContent?: number[];
}

Hierarchy (View Summary)

Properties

author?: IdentityRef

User who created the resolution.

userMergedBlob?: GitBlobRef
userMergedContent?: number[]