ConflictResolution
import type { ConflictResolution } from "https://aws-api.deno.dev/v0.3/services/codecommit.ts?docs=full";If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.
interface ConflictResolution {
deleteFiles?: DeleteFileEntry[] | null;
replaceContents?: ReplaceContentEntry[] | null;
setFileModes?: SetFileModeEntry[] | null;
}§Properties
§
deleteFiles?: DeleteFileEntry[] | null
[src]Files to be deleted as part of the merge conflict resolution.
§
replaceContents?: ReplaceContentEntry[] | null
[src]Files to have content replaced as part of the merge conflict resolution.
§
setFileModes?: SetFileModeEntry[] | null
[src]File modes that are set as part of the merge conflict resolution.