Skip to main content

Home > git-documentdb > SyncResultResolveConflictsAndPushError

SyncResultResolveConflictsAndPushError type#

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

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

ChangedFile , AcceptedConflict , NormalizedCommit


  • commits are sorted from old to new.

  • commits.local: List of commits that had been pulled to local