Čitajte na engleskom Uređivanje

Dijeli putem

GitConflictRename2to1 interface

  • Reference
Package:
azure-devops-extension-api

Data object for Rename2to1 conflict

Extends
GitConflict

Property Details

resolution 

resolution: GitResolutionPathConflict

Property Value

GitResolutionPathConflict

sourceNewBlob 

sourceNewBlob: GitBlobRef

Property Value

GitBlobRef

sourceOriginalBlob 

sourceOriginalBlob: GitBlobRef

Property Value

GitBlobRef

sourceOriginalPath 

sourceOriginalPath: string

Property Value

string

targetNewBlob 

targetNewBlob: GitBlobRef

Property Value

GitBlobRef

targetOriginalBlob 

targetOriginalBlob: GitBlobRef

Property Value

GitBlobRef

targetOriginalPath 

targetOriginalPath: 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