Skip to main content

Home > git-documentdb > SyncResultResolveConflictsAndPush

SyncResultResolveConflictsAndPush type#

Synchronization resolved conflicts, created a merge commit, and pushed it.

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

ChangedFile , AcceptedConflict , NormalizedCommit


  • commits are sorted from old to new.

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

  • commits.remote: List of commits that had been pushed to remote