Amazonka.CodeCommit.BatchDescribeMergeConflicts

Returns information about one or more merge conflicts in the attempted merge of two commit specifiers using the squash or three-way merge strategy.

Creating a Request

data BatchDescribeMergeConflicts

See: newBatchDescribeMergeConflicts smart constructor.

Constructors

BatchDescribeMergeConflicts'

Fields

• conflictDetailLevel :: Maybe ConflictDetailLevelTypeEnum

  The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.

• conflictResolutionStrategy :: Maybe ConflictResolutionStrategyTypeEnum

  Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.

• filePaths :: Maybe [Text]

  The path of the target files used to describe the conflicts. If not specified, the default is all conflict files.

• maxConflictFiles :: Maybe Int

  The maximum number of files to include in the output.

• maxMergeHunks :: Maybe Int

  The maximum number of merge hunks to include in the output.

• nextToken :: Maybe Text

  An enumeration token that, when provided in a request, returns the next batch of the results.

• repositoryName :: Text

  The name of the repository that contains the merge conflicts you want to review.

• destinationCommitSpecifier :: Text

  The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

• sourceCommitSpecifier :: Text

  The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

• mergeOption :: MergeOptionTypeEnum

  The merge option or strategy you want to use to merge the code.

Instances

ToJSON BatchDescribeMergeConflicts

Defined in Amazonka.CodeCommit.BatchDescribeMergeConflicts

Methods

toJSON :: BatchDescribeMergeConflicts -> Value

toEncoding :: BatchDescribeMergeConflicts -> Encoding

toJSONList :: [BatchDescribeMergeConflicts] -> Value

toEncodingList :: [BatchDescribeMergeConflicts] -> Encoding

ToHeaders BatchDescribeMergeConflicts

Defined in Amazonka.CodeCommit.BatchDescribeMergeConflicts

Methods

toHeaders :: BatchDescribeMergeConflicts -> [Header]

ToPath BatchDescribeMergeConflicts

Defined in Amazonka.CodeCommit.BatchDescribeMergeConflicts

Methods

toPath :: BatchDescribeMergeConflicts -> ByteString

ToQuery BatchDescribeMergeConflicts

Defined in Amazonka.CodeCommit.BatchDescribeMergeConflicts

Methods

toQuery :: BatchDescribeMergeConflicts -> QueryString

AWSRequest BatchDescribeMergeConflicts

Defined in Amazonka.CodeCommit.BatchDescribeMergeConflicts

Associated Types

type AWSResponse BatchDescribeMergeConflicts

Methods

request :: (Service -> Service) -> BatchDescribeMergeConflicts -> Request BatchDescribeMergeConflicts

response :: MonadResource m => (ByteStringLazy -> IO ByteStringLazy) -> Service -> Proxy BatchDescribeMergeConflicts -> ClientResponse ClientBody -> m (Either Error (ClientResponse (AWSResponse BatchDescribeMergeConflicts)))

Generic BatchDescribeMergeConflicts

Defined in Amazonka.CodeCommit.BatchDescribeMergeConflicts

Associated Types

type Rep BatchDescribeMergeConflicts :: Type -> Type

Methods

from :: BatchDescribeMergeConflicts -> Rep BatchDescribeMergeConflicts x

to :: Rep BatchDescribeMergeConflicts x -> BatchDescribeMergeConflicts

Read BatchDescribeMergeConflicts

Defined in Amazonka.CodeCommit.BatchDescribeMergeConflicts

Methods

readsPrec :: Int -> ReadS BatchDescribeMergeConflicts

readList :: ReadS [BatchDescribeMergeConflicts]

readPrec :: ReadPrec BatchDescribeMergeConflicts

readListPrec :: ReadPrec [BatchDescribeMergeConflicts]

Show BatchDescribeMergeConflicts

Defined in Amazonka.CodeCommit.BatchDescribeMergeConflicts

Methods

showsPrec :: Int -> BatchDescribeMergeConflicts -> ShowS

show :: BatchDescribeMergeConflicts -> String

showList :: [BatchDescribeMergeConflicts] -> ShowS

NFData BatchDescribeMergeConflicts

Defined in Amazonka.CodeCommit.BatchDescribeMergeConflicts

Methods

rnf :: BatchDescribeMergeConflicts -> ()

Eq BatchDescribeMergeConflicts

Defined in Amazonka.CodeCommit.BatchDescribeMergeConflicts

Methods

(==) :: BatchDescribeMergeConflicts -> BatchDescribeMergeConflicts -> Bool

(/=) :: BatchDescribeMergeConflicts -> BatchDescribeMergeConflicts -> Bool

Hashable BatchDescribeMergeConflicts

Defined in Amazonka.CodeCommit.BatchDescribeMergeConflicts

Methods

hashWithSalt :: Int -> BatchDescribeMergeConflicts -> Int

hash :: BatchDescribeMergeConflicts -> Int

type AWSResponse BatchDescribeMergeConflicts

Defined in Amazonka.CodeCommit.BatchDescribeMergeConflicts

type AWSResponse BatchDescribeMergeConflicts = BatchDescribeMergeConflictsResponse

type Rep BatchDescribeMergeConflicts

Defined in Amazonka.CodeCommit.BatchDescribeMergeConflicts

type Rep BatchDescribeMergeConflicts = D1 ('MetaData "BatchDescribeMergeConflicts" "Amazonka.CodeCommit.BatchDescribeMergeConflicts" "amazonka-codecommit-2.0-974g5LOhuTPG9HgUSx02zG" 'False) (C1 ('MetaCons "BatchDescribeMergeConflicts'" 'PrefixI 'True) (((S1 ('MetaSel ('Just "conflictDetailLevel") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe ConflictDetailLevelTypeEnum)) :*: S1 ('MetaSel ('Just "conflictResolutionStrategy") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe ConflictResolutionStrategyTypeEnum))) :*: (S1 ('MetaSel ('Just "filePaths") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe [Text])) :*: (S1 ('MetaSel ('Just "maxConflictFiles") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe Int)) :*: S1 ('MetaSel ('Just "maxMergeHunks") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe Int))))) :*: ((S1 ('MetaSel ('Just "nextToken") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe Text)) :*: S1 ('MetaSel ('Just "repositoryName") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 Text)) :*: (S1 ('MetaSel ('Just "destinationCommitSpecifier") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 Text) :*: (S1 ('MetaSel ('Just "sourceCommitSpecifier") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 Text) :*: S1 ('MetaSel ('Just "mergeOption") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 MergeOptionTypeEnum))))))

newBatchDescribeMergeConflicts

Arguments

:: Text

BatchDescribeMergeConflicts

-> Text

$sel:destinationCommitSpecifier:BatchDescribeMergeConflicts'

-> Text

$sel:sourceCommitSpecifier:BatchDescribeMergeConflicts'

-> MergeOptionTypeEnum

BatchDescribeMergeConflicts

-> BatchDescribeMergeConflicts

Create a value of BatchDescribeMergeConflicts with all optional fields omitted.

Use generic-lens or optics to modify other optional fields.

The following record fields are available, with the corresponding lenses provided for backwards compatibility:

$sel:conflictDetailLevel:BatchDescribeMergeConflicts', batchDescribeMergeConflicts_conflictDetailLevel - The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.

$sel:conflictResolutionStrategy:BatchDescribeMergeConflicts', batchDescribeMergeConflicts_conflictResolutionStrategy - Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.

$sel:filePaths:BatchDescribeMergeConflicts', batchDescribeMergeConflicts_filePaths - The path of the target files used to describe the conflicts. If not specified, the default is all conflict files.

$sel:maxConflictFiles:BatchDescribeMergeConflicts', batchDescribeMergeConflicts_maxConflictFiles - The maximum number of files to include in the output.

$sel:maxMergeHunks:BatchDescribeMergeConflicts', batchDescribeMergeConflicts_maxMergeHunks - The maximum number of merge hunks to include in the output.

BatchDescribeMergeConflicts, batchDescribeMergeConflicts_nextToken - An enumeration token that, when provided in a request, returns the next batch of the results.

BatchDescribeMergeConflicts, batchDescribeMergeConflicts_repositoryName - The name of the repository that contains the merge conflicts you want to review.

$sel:destinationCommitSpecifier:BatchDescribeMergeConflicts', batchDescribeMergeConflicts_destinationCommitSpecifier - The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

$sel:sourceCommitSpecifier:BatchDescribeMergeConflicts', batchDescribeMergeConflicts_sourceCommitSpecifier - The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

BatchDescribeMergeConflicts, batchDescribeMergeConflicts_mergeOption - The merge option or strategy you want to use to merge the code.

Request Lenses

batchDescribeMergeConflicts_conflictDetailLevel :: Lens' BatchDescribeMergeConflicts (Maybe ConflictDetailLevelTypeEnum)

The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.

batchDescribeMergeConflicts_conflictResolutionStrategy :: Lens' BatchDescribeMergeConflicts (Maybe ConflictResolutionStrategyTypeEnum)

Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.

batchDescribeMergeConflicts_filePaths :: Lens' BatchDescribeMergeConflicts (Maybe [Text])

The path of the target files used to describe the conflicts. If not specified, the default is all conflict files.

batchDescribeMergeConflicts_maxConflictFiles :: Lens' BatchDescribeMergeConflicts (Maybe Int)

The maximum number of files to include in the output.

batchDescribeMergeConflicts_maxMergeHunks :: Lens' BatchDescribeMergeConflicts (Maybe Int)

The maximum number of merge hunks to include in the output.

batchDescribeMergeConflicts_nextToken :: Lens' BatchDescribeMergeConflicts (Maybe Text)

An enumeration token that, when provided in a request, returns the next batch of the results.

batchDescribeMergeConflicts_repositoryName :: Lens' BatchDescribeMergeConflicts Text

The name of the repository that contains the merge conflicts you want to review.

batchDescribeMergeConflicts_destinationCommitSpecifier :: Lens' BatchDescribeMergeConflicts Text

The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

batchDescribeMergeConflicts_sourceCommitSpecifier :: Lens' BatchDescribeMergeConflicts Text

The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

batchDescribeMergeConflicts_mergeOption :: Lens' BatchDescribeMergeConflicts MergeOptionTypeEnum

The merge option or strategy you want to use to merge the code.

Destructuring the Response

data BatchDescribeMergeConflictsResponse

See: newBatchDescribeMergeConflictsResponse smart constructor.

Constructors

BatchDescribeMergeConflictsResponse'

Fields

• baseCommitId :: Maybe Text

  The commit ID of the merge base.

• errors :: Maybe [BatchDescribeMergeConflictsError]

  A list of any errors returned while describing the merge conflicts for each file.

• nextToken :: Maybe Text

  An enumeration token that can be used in a request to return the next batch of the results.

• httpStatus :: Int

  The response's http status code.

• conflicts :: [Conflict]

  A list of conflicts for each file, including the conflict metadata and the hunks of the differences between the files.

• destinationCommitId :: Text

  The commit ID of the destination commit specifier that was used in the merge evaluation.

• sourceCommitId :: Text

  The commit ID of the source commit specifier that was used in the merge evaluation.

Instances

Generic BatchDescribeMergeConflictsResponse

Defined in Amazonka.CodeCommit.BatchDescribeMergeConflicts

Associated Types

type Rep BatchDescribeMergeConflictsResponse :: Type -> Type

Methods

from :: BatchDescribeMergeConflictsResponse -> Rep BatchDescribeMergeConflictsResponse x

to :: Rep BatchDescribeMergeConflictsResponse x -> BatchDescribeMergeConflictsResponse

Read BatchDescribeMergeConflictsResponse

Defined in Amazonka.CodeCommit.BatchDescribeMergeConflicts

Methods

readsPrec :: Int -> ReadS BatchDescribeMergeConflictsResponse

readList :: ReadS [BatchDescribeMergeConflictsResponse]

readPrec :: ReadPrec BatchDescribeMergeConflictsResponse

readListPrec :: ReadPrec [BatchDescribeMergeConflictsResponse]

Show BatchDescribeMergeConflictsResponse

Defined in Amazonka.CodeCommit.BatchDescribeMergeConflicts

Methods

showsPrec :: Int -> BatchDescribeMergeConflictsResponse -> ShowS

show :: BatchDescribeMergeConflictsResponse -> String

showList :: [BatchDescribeMergeConflictsResponse] -> ShowS

NFData BatchDescribeMergeConflictsResponse

Defined in Amazonka.CodeCommit.BatchDescribeMergeConflicts

Methods

rnf :: BatchDescribeMergeConflictsResponse -> ()

Eq BatchDescribeMergeConflictsResponse

Defined in Amazonka.CodeCommit.BatchDescribeMergeConflicts

Methods

(==) :: BatchDescribeMergeConflictsResponse -> BatchDescribeMergeConflictsResponse -> Bool

(/=) :: BatchDescribeMergeConflictsResponse -> BatchDescribeMergeConflictsResponse -> Bool

type Rep BatchDescribeMergeConflictsResponse

Defined in Amazonka.CodeCommit.BatchDescribeMergeConflicts

type Rep BatchDescribeMergeConflictsResponse = D1 ('MetaData "BatchDescribeMergeConflictsResponse" "Amazonka.CodeCommit.BatchDescribeMergeConflicts" "amazonka-codecommit-2.0-974g5LOhuTPG9HgUSx02zG" 'False) (C1 ('MetaCons "BatchDescribeMergeConflictsResponse'" 'PrefixI 'True) ((S1 ('MetaSel ('Just "baseCommitId") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe Text)) :*: (S1 ('MetaSel ('Just "errors") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe [BatchDescribeMergeConflictsError])) :*: S1 ('MetaSel ('Just "nextToken") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe Text)))) :*: ((S1 ('MetaSel ('Just "httpStatus") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 Int) :*: S1 ('MetaSel ('Just "conflicts") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 [Conflict])) :*: (S1 ('MetaSel ('Just "destinationCommitId") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 Text) :*: S1 ('MetaSel ('Just "sourceCommitId") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 Text)))))

newBatchDescribeMergeConflictsResponse

Arguments

:: Int

$sel:httpStatus:BatchDescribeMergeConflictsResponse'

-> Text

BatchDescribeMergeConflictsResponse

-> Text

BatchDescribeMergeConflictsResponse

-> BatchDescribeMergeConflictsResponse

Create a value of BatchDescribeMergeConflictsResponse with all optional fields omitted.

Use generic-lens or optics to modify other optional fields.

The following record fields are available, with the corresponding lenses provided for backwards compatibility:

$sel:baseCommitId:BatchDescribeMergeConflictsResponse', batchDescribeMergeConflictsResponse_baseCommitId - The commit ID of the merge base.

$sel:errors:BatchDescribeMergeConflictsResponse', batchDescribeMergeConflictsResponse_errors - A list of any errors returned while describing the merge conflicts for each file.

BatchDescribeMergeConflicts, batchDescribeMergeConflictsResponse_nextToken - An enumeration token that can be used in a request to return the next batch of the results.

$sel:httpStatus:BatchDescribeMergeConflictsResponse', batchDescribeMergeConflictsResponse_httpStatus - The response's http status code.

$sel:conflicts:BatchDescribeMergeConflictsResponse', batchDescribeMergeConflictsResponse_conflicts - A list of conflicts for each file, including the conflict metadata and the hunks of the differences between the files.

BatchDescribeMergeConflictsResponse, batchDescribeMergeConflictsResponse_destinationCommitId - The commit ID of the destination commit specifier that was used in the merge evaluation.

BatchDescribeMergeConflictsResponse, batchDescribeMergeConflictsResponse_sourceCommitId - The commit ID of the source commit specifier that was used in the merge evaluation.

Response Lenses

batchDescribeMergeConflictsResponse_baseCommitId :: Lens' BatchDescribeMergeConflictsResponse (Maybe Text)

The commit ID of the merge base.

batchDescribeMergeConflictsResponse_errors :: Lens' BatchDescribeMergeConflictsResponse (Maybe [BatchDescribeMergeConflictsError])

A list of any errors returned while describing the merge conflicts for each file.

batchDescribeMergeConflictsResponse_nextToken :: Lens' BatchDescribeMergeConflictsResponse (Maybe Text)

An enumeration token that can be used in a request to return the next batch of the results.

batchDescribeMergeConflictsResponse_httpStatus :: Lens' BatchDescribeMergeConflictsResponse Int

The response's http status code.

batchDescribeMergeConflictsResponse_conflicts :: Lens' BatchDescribeMergeConflictsResponse [Conflict]

A list of conflicts for each file, including the conflict metadata and the hunks of the differences between the files.

batchDescribeMergeConflictsResponse_destinationCommitId :: Lens' BatchDescribeMergeConflictsResponse Text

The commit ID of the destination commit specifier that was used in the merge evaluation.

batchDescribeMergeConflictsResponse_sourceCommitId :: Lens' BatchDescribeMergeConflictsResponse Text

The commit ID of the source commit specifier that was used in the merge evaluation.