Edit

Share via

GitConflictRenameDelete interface

  • Reference
Package:
azure-devops-extension-api

Data object for DeleteRename conflict

Extends
GitConflict

Properties

baseBlob
resolution
sourceBlob
sourceNewPath

Property Details

baseBlob 

baseBlob: GitBlobRef

Property Value

GitBlobRef

resolution 

resolution: GitResolutionPickOneAction

Property Value

GitResolutionPickOneAction

sourceBlob 

sourceBlob: GitBlobRef

Property Value

GitBlobRef

sourceNewPath 

sourceNewPath: string

Property Value

string

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