interface GitConflictUpdateResult {
    conflictId?: number;
    customMessage?: string;
    updatedConflict?: GitConflict;
    updateStatus?: GitConflictUpdateStatus;
}

Properties

conflictId?: number

Conflict ID that was provided by input

customMessage?: string

Reason for failing

updatedConflict?: GitConflict

New state of the conflict after updating

Status of the update on the server