Hi there! Are you looking for the official Deno documentation? Try docs.deno.com for all your Deno learning needs.

Conflict

import type { Conflict } from "https://aws-api.deno.dev/v0.3/services/codecommit.ts?docs=full";

Information about conflicts in a merge operation.

interface Conflict {
conflictMetadata?: ConflictMetadata | null;
mergeHunks?: MergeHunk[] | null;
}

§Properties

§
conflictMetadata?: ConflictMetadata | null
[src]

Metadata about a conflict in a merge operation.

§
mergeHunks?: MergeHunk[] | null
[src]

A list of hunks that contain the differences between files or lines causing the conflict.