GitConflictRenameAdd interface

Data object for AddRename conflict

Extends

Properties

baseBlob
resolution
sourceBlob
sourceOriginalPath
targetBlob

Inherited Properties

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

Property Details

baseBlob

baseBlob: GitBlobRef

Property Value

resolution

resolution: GitResolutionPathConflict

Property Value

sourceBlob

sourceBlob: GitBlobRef

Property Value

sourceOriginalPath

sourceOriginalPath: string

Property Value

string

targetBlob

targetBlob: GitBlobRef

Property Value

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

Inherited From GitConflict.conflictType

mergeBaseCommit

mergeBaseCommit: GitCommitRef

Property Value

Inherited From GitConflict.mergeBaseCommit

mergeOrigin

mergeOrigin: GitMergeOriginRef

Property Value

Inherited From GitConflict.mergeOrigin

mergeSourceCommit

mergeSourceCommit: GitCommitRef

Property Value

Inherited From GitConflict.mergeSourceCommit

mergeTargetCommit

mergeTargetCommit: GitCommitRef

Property Value

Inherited From GitConflict.mergeTargetCommit

resolutionError

resolutionError: GitResolutionError

Property Value

Inherited From GitConflict.resolutionError

resolutionStatus

resolutionStatus: GitResolutionStatus

Property Value

Inherited From GitConflict.resolutionStatus

resolvedBy

resolvedBy: IdentityRef

Property Value

Inherited From GitConflict.resolvedBy

resolvedDate

resolvedDate: Date

Property Value

Date

Inherited From GitConflict.resolvedDate

url

url: string

Property Value

string

Inherited From GitConflict.url