SyncResultResolveConflictsAndPushError type

Home > git-documentdb > SyncResultResolveConflictsAndPushError

SyncResultResolveConflictsAndPushError type#

Synchronization resolved conflicts, created a merge commit, and failed to push it.

Signature:

export declare type SyncResultResolveConflictsAndPushError = {
    action: 'resolve conflicts and push error';
    changes: {
        local: ChangedFile[];
    };
    conflicts: AcceptedConflict[];
    commits?: {
        local: NormalizedCommit[];
    };
    error: Error;
};

References:

ChangedFile , AcceptedConflict , NormalizedCommit

Remarks#

commits are sorted from old to new.
commits.local: List of commits that had been pulled to local