GitConflict interface

Package:

azure-devops-extension-api

Properties

conflictId
conflictPath
conflictType
mergeBaseCommit
mergeOrigin
mergeSourceCommit
mergeTargetCommit
resolutionError
resolutionStatus
resolvedBy
resolvedDate
url

Property Details

conflictId

conflictId: number

Property Value

number

conflictPath

conflictPath: string

Property Value

string

conflictType

conflictType: GitConflictType

Property Value

GitConflictType

mergeBaseCommit

mergeBaseCommit: GitCommitRef

Property Value

GitCommitRef

mergeOrigin

mergeOrigin: GitMergeOriginRef

Property Value

GitMergeOriginRef

mergeSourceCommit

mergeSourceCommit: GitCommitRef

Property Value

GitCommitRef

mergeTargetCommit

mergeTargetCommit: GitCommitRef

Property Value

GitCommitRef

resolutionError

resolutionError: GitResolutionError

Property Value

GitResolutionError

resolutionStatus

resolutionStatus: GitResolutionStatus

Property Value

GitResolutionStatus

resolvedBy

resolvedBy: IdentityRef

Property Value

IdentityRef

resolvedDate

resolvedDate: Date

Property Value

Date

url

url: string

Property Value

string