GitConflictAddAdd interface

Package:

azure-devops-extension-api

Data object for AddAdd conflict

Extends

GitConflict

Properties

resolution
sourceBlob
targetBlob

Inherited Properties

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

Property Details

resolution

resolution: GitResolutionMergeContent

Property Value

GitResolutionMergeContent

sourceBlob

sourceBlob: GitBlobRef

Property Value

GitBlobRef

targetBlob

targetBlob: GitBlobRef

Property Value

GitBlobRef

Inherited Property Details

conflictId

conflictId: number

Property Value

number

Inherited From GitConflict.conflictId

conflictPath

conflictPath: string

Property Value

string

Inherited From GitConflict.conflictPath

conflictType

conflictType: GitConflictType

Property Value

GitConflictType

Inherited From GitConflict.conflictType

mergeBaseCommit

mergeBaseCommit: GitCommitRef

Property Value

GitCommitRef

Inherited From GitConflict.mergeBaseCommit

mergeOrigin

mergeOrigin: GitMergeOriginRef

Property Value

GitMergeOriginRef

Inherited From GitConflict.mergeOrigin

mergeSourceCommit

mergeSourceCommit: GitCommitRef

Property Value

GitCommitRef

Inherited From GitConflict.mergeSourceCommit

mergeTargetCommit

mergeTargetCommit: GitCommitRef

Property Value

GitCommitRef

Inherited From GitConflict.mergeTargetCommit

resolutionError

resolutionError: GitResolutionError

Property Value

GitResolutionError

Inherited From GitConflict.resolutionError

resolutionStatus

resolutionStatus: GitResolutionStatus

Property Value

GitResolutionStatus

Inherited From GitConflict.resolutionStatus

resolvedBy

resolvedBy: IdentityRef

Property Value

IdentityRef

Inherited From GitConflict.resolvedBy

resolvedDate

resolvedDate: Date

Property Value

Date

Inherited From GitConflict.resolvedDate

url

url: string

Property Value

string

Inherited From GitConflict.url