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

Conflict ID that was provided by input

conflictId: number

number

Reason for failing

customMessage: string

string

New state of the conflict after updating

updatedConflict: GitConflict

GitConflict

Status of the update on the server

updateStatus: GitConflictUpdateStatus