Method merge

packages/computer/src/git/network.ts:107–107

(args: {
    fs: object;
    dir: string;
    ours?: string;
    theirs: string;
    fastForward?: boolean;
    fastForwardOnly?: boolean;
    abortOnConflict?: boolean;
    message?: string;
    author?: { name: string; email: string };
    committer?: { name: string; email: string };
    dryRun?: boolean;
    cache?: object;
  })

    cache?: object;
  }): Promise<void>;
  merge(args: {
    fs: object;
    dir: string;
    ours?: string;