import { Command as $Command } from "@smithy/smithy-client"; import type { MetadataBearer as __MetadataBearer } from "@smithy/types"; import type { CodeCommitClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../CodeCommitClient"; import type { DescribeMergeConflictsInput, DescribeMergeConflictsOutput } from "../models/models_0"; /** * @public */ export type { __MetadataBearer }; export { $Command }; /** * @public * * The input for {@link DescribeMergeConflictsCommand}. */ export interface DescribeMergeConflictsCommandInput extends DescribeMergeConflictsInput { } /** * @public * * The output of {@link DescribeMergeConflictsCommand}. */ export interface DescribeMergeConflictsCommandOutput extends DescribeMergeConflictsOutput, __MetadataBearer { } declare const DescribeMergeConflictsCommand_base: { new (input: DescribeMergeConflictsCommandInput): import("@smithy/smithy-client").CommandImpl; new (input: DescribeMergeConflictsCommandInput): import("@smithy/smithy-client").CommandImpl; getEndpointParameterInstructions(): import("@smithy/middleware-endpoint").EndpointParameterInstructions; }; /** *

Returns information about one or more merge conflicts in the attempted merge of two * commit specifiers using the squash or three-way merge strategy. If the merge option for * the attempted merge is specified as FAST_FORWARD_MERGE, an exception is thrown.

* @example * Use a bare-bones client and the command you need to make an API call. * ```javascript * import { CodeCommitClient, DescribeMergeConflictsCommand } from "@aws-sdk/client-codecommit"; // ES Modules import * // const { CodeCommitClient, DescribeMergeConflictsCommand } = require("@aws-sdk/client-codecommit"); // CommonJS import * // import type { CodeCommitClientConfig } from "@aws-sdk/client-codecommit"; * const config = {}; // type is CodeCommitClientConfig * const client = new CodeCommitClient(config); * const input = { // DescribeMergeConflictsInput * repositoryName: "STRING_VALUE", // required * destinationCommitSpecifier: "STRING_VALUE", // required * sourceCommitSpecifier: "STRING_VALUE", // required * mergeOption: "FAST_FORWARD_MERGE" || "SQUASH_MERGE" || "THREE_WAY_MERGE", // required * maxMergeHunks: Number("int"), * filePath: "STRING_VALUE", // required * conflictDetailLevel: "FILE_LEVEL" || "LINE_LEVEL", * conflictResolutionStrategy: "NONE" || "ACCEPT_SOURCE" || "ACCEPT_DESTINATION" || "AUTOMERGE", * nextToken: "STRING_VALUE", * }; * const command = new DescribeMergeConflictsCommand(input); * const response = await client.send(command); * // { // DescribeMergeConflictsOutput * // conflictMetadata: { // ConflictMetadata * // filePath: "STRING_VALUE", * // fileSizes: { // FileSizes * // source: Number("long"), * // destination: Number("long"), * // base: Number("long"), * // }, * // fileModes: { // FileModes * // source: "EXECUTABLE" || "NORMAL" || "SYMLINK", * // destination: "EXECUTABLE" || "NORMAL" || "SYMLINK", * // base: "EXECUTABLE" || "NORMAL" || "SYMLINK", * // }, * // objectTypes: { // ObjectTypes * // source: "FILE" || "DIRECTORY" || "GIT_LINK" || "SYMBOLIC_LINK", * // destination: "FILE" || "DIRECTORY" || "GIT_LINK" || "SYMBOLIC_LINK", * // base: "FILE" || "DIRECTORY" || "GIT_LINK" || "SYMBOLIC_LINK", * // }, * // numberOfConflicts: Number("int"), * // isBinaryFile: { // IsBinaryFile * // source: true || false, * // destination: true || false, * // base: true || false, * // }, * // contentConflict: true || false, * // fileModeConflict: true || false, * // objectTypeConflict: true || false, * // mergeOperations: { // MergeOperations * // source: "A" || "M" || "D", * // destination: "A" || "M" || "D", * // }, * // }, * // mergeHunks: [ // MergeHunks // required * // { // MergeHunk * // isConflict: true || false, * // source: { // MergeHunkDetail * // startLine: Number("int"), * // endLine: Number("int"), * // hunkContent: "STRING_VALUE", * // }, * // destination: { * // startLine: Number("int"), * // endLine: Number("int"), * // hunkContent: "STRING_VALUE", * // }, * // base: { * // startLine: Number("int"), * // endLine: Number("int"), * // hunkContent: "STRING_VALUE", * // }, * // }, * // ], * // nextToken: "STRING_VALUE", * // destinationCommitId: "STRING_VALUE", // required * // sourceCommitId: "STRING_VALUE", // required * // baseCommitId: "STRING_VALUE", * // }; * * ``` * * @param DescribeMergeConflictsCommandInput - {@link DescribeMergeConflictsCommandInput} * @returns {@link DescribeMergeConflictsCommandOutput} * @see {@link DescribeMergeConflictsCommandInput} for command's `input` shape. * @see {@link DescribeMergeConflictsCommandOutput} for command's `response` shape. * @see {@link CodeCommitClientResolvedConfig | config} for CodeCommitClient's `config` shape. * * @throws {@link CommitDoesNotExistException} (client fault) *

The specified commit does not exist or no commit was specified, and the specified repository has no default branch.

* * @throws {@link CommitRequiredException} (client fault) *

A commit was not specified.

* * @throws {@link EncryptionIntegrityChecksFailedException} (server fault) *

An encryption integrity check failed.

* * @throws {@link EncryptionKeyAccessDeniedException} (client fault) *

An encryption key could not be accessed.

* * @throws {@link EncryptionKeyDisabledException} (client fault) *

The encryption key is disabled.

* * @throws {@link EncryptionKeyNotFoundException} (client fault) *

No encryption key was found.

* * @throws {@link EncryptionKeyUnavailableException} (client fault) *

The encryption key is not available.

* * @throws {@link FileDoesNotExistException} (client fault) *

The specified file does not exist. Verify that you have used the correct file name, * full path, and extension.

* * @throws {@link InvalidCommitException} (client fault) *

The specified commit is not valid.

* * @throws {@link InvalidConflictDetailLevelException} (client fault) *

The specified conflict detail level is not valid.

* * @throws {@link InvalidConflictResolutionStrategyException} (client fault) *

The specified conflict resolution strategy is not valid.

* * @throws {@link InvalidContinuationTokenException} (client fault) *

The specified continuation token is not valid.

* * @throws {@link InvalidMaxMergeHunksException} (client fault) *

The specified value for the number of merge hunks to return is not valid.

* * @throws {@link InvalidMergeOptionException} (client fault) *

The specified merge option is not valid for this operation. Not all merge strategies are supported for all operations.

* * @throws {@link InvalidPathException} (client fault) *

The specified path is not valid.

* * @throws {@link InvalidRepositoryNameException} (client fault) *

A specified repository name is not valid.

* *

This exception occurs only when a specified repository name is not valid. Other * exceptions occur when a required repository parameter is missing, or when a * specified repository does not exist.

*
* * @throws {@link MaximumFileContentToLoadExceededException} (client fault) *

The number of files to load exceeds the allowed limit.

* * @throws {@link MaximumItemsToCompareExceededException} (client fault) *

The number of items to compare between the source or destination branches and the merge base has exceeded the maximum allowed.

* * @throws {@link MergeOptionRequiredException} (client fault) *

A merge option or stategy is required, and none was provided.

* * @throws {@link PathRequiredException} (client fault) *

The folderPath for a location cannot be null.

* * @throws {@link RepositoryDoesNotExistException} (client fault) *

The specified repository does not exist.

* * @throws {@link RepositoryNameRequiredException} (client fault) *

A repository name is required, but was not specified.

* * @throws {@link TipsDivergenceExceededException} (client fault) *

The divergence between the tips of the provided commit specifiers is too great to determine whether there might be * any merge conflicts. Locally compare the specifiers using git diff or a diff tool.

* * @throws {@link CodeCommitServiceException} *

Base exception class for all service exceptions from CodeCommit service.

* * * @public */ export declare class DescribeMergeConflictsCommand extends DescribeMergeConflictsCommand_base { /** @internal type navigation helper, not in runtime. */ protected static __types: { api: { input: DescribeMergeConflictsInput; output: DescribeMergeConflictsOutput; }; sdk: { input: DescribeMergeConflictsCommandInput; output: DescribeMergeConflictsCommandOutput; }; }; }