Edit

Share via


GitConflictEditEdit interface

Data object for EditEdit conflict

Extends

Properties

Inherited Properties

Property Details

baseBlob

baseBlob: GitBlobRef

Property Value

resolution

resolution: GitResolutionMergeContent

Property Value

sourceBlob

sourceBlob: GitBlobRef

Property Value

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