GitConflictUpdateResult interface

Properties

conflictId

Conflict ID that was provided by input

customMessage

Reason for failing

updatedConflict

New state of the conflict after updating

updateStatus

Status of the update on the server

Property Details

conflictId

Conflict ID that was provided by input

conflictId: number

Property Value

number

customMessage

Reason for failing

customMessage: string

Property Value

string

updatedConflict

New state of the conflict after updating

updatedConflict: GitConflict

Property Value

updateStatus

Status of the update on the server

updateStatus: GitConflictUpdateStatus

Property Value