MergeConflict

import type { MergeConflict } from "https://googleapis.deno.dev/v1/tagmanager:v2.ts";

Represents a merge conflict.

interface MergeConflict {

entityInBaseVersion?: Entity;

entityInWorkspace?: Entity;

}

§Properties

entityInBaseVersion?: Entity

[src]

The base version entity (since the latest sync operation) that has conflicting changes compared to the workspace. If this field is missing, it means the workspace entity is deleted from the base version.

entityInWorkspace?: Entity

[src]

The workspace entity that has conflicting changes compared to the base version. If an entity is deleted in a workspace, it will still appear with a deleted change status.