Copyright | (c) 2013-2021 Brendan Hay |
---|---|
License | Mozilla Public License, v. 2.0. |
Maintainer | Brendan Hay <brendan.g.hay+amazonka@gmail.com> |
Stability | auto-generated |
Portability | non-portable (GHC extensions) |
Safe Haskell | None |
Returns information about one or more merge conflicts in the attempted merge of two commit specifiers using the squash or three-way merge strategy.
Synopsis
- data BatchDescribeMergeConflicts = BatchDescribeMergeConflicts' {
- filePaths :: Maybe [Text]
- conflictDetailLevel :: Maybe ConflictDetailLevelTypeEnum
- nextToken :: Maybe Text
- maxConflictFiles :: Maybe Int
- maxMergeHunks :: Maybe Int
- conflictResolutionStrategy :: Maybe ConflictResolutionStrategyTypeEnum
- repositoryName :: Text
- destinationCommitSpecifier :: Text
- sourceCommitSpecifier :: Text
- mergeOption :: MergeOptionTypeEnum
- newBatchDescribeMergeConflicts :: Text -> Text -> Text -> MergeOptionTypeEnum -> BatchDescribeMergeConflicts
- batchDescribeMergeConflicts_filePaths :: Lens' BatchDescribeMergeConflicts (Maybe [Text])
- batchDescribeMergeConflicts_conflictDetailLevel :: Lens' BatchDescribeMergeConflicts (Maybe ConflictDetailLevelTypeEnum)
- batchDescribeMergeConflicts_nextToken :: Lens' BatchDescribeMergeConflicts (Maybe Text)
- batchDescribeMergeConflicts_maxConflictFiles :: Lens' BatchDescribeMergeConflicts (Maybe Int)
- batchDescribeMergeConflicts_maxMergeHunks :: Lens' BatchDescribeMergeConflicts (Maybe Int)
- batchDescribeMergeConflicts_conflictResolutionStrategy :: Lens' BatchDescribeMergeConflicts (Maybe ConflictResolutionStrategyTypeEnum)
- batchDescribeMergeConflicts_repositoryName :: Lens' BatchDescribeMergeConflicts Text
- batchDescribeMergeConflicts_destinationCommitSpecifier :: Lens' BatchDescribeMergeConflicts Text
- batchDescribeMergeConflicts_sourceCommitSpecifier :: Lens' BatchDescribeMergeConflicts Text
- batchDescribeMergeConflicts_mergeOption :: Lens' BatchDescribeMergeConflicts MergeOptionTypeEnum
- data BatchDescribeMergeConflictsResponse = BatchDescribeMergeConflictsResponse' {}
- newBatchDescribeMergeConflictsResponse :: Int -> Text -> Text -> BatchDescribeMergeConflictsResponse
- batchDescribeMergeConflictsResponse_baseCommitId :: Lens' BatchDescribeMergeConflictsResponse (Maybe Text)
- batchDescribeMergeConflictsResponse_nextToken :: Lens' BatchDescribeMergeConflictsResponse (Maybe Text)
- batchDescribeMergeConflictsResponse_errors :: Lens' BatchDescribeMergeConflictsResponse (Maybe [BatchDescribeMergeConflictsError])
- batchDescribeMergeConflictsResponse_httpStatus :: Lens' BatchDescribeMergeConflictsResponse Int
- batchDescribeMergeConflictsResponse_conflicts :: Lens' BatchDescribeMergeConflictsResponse [Conflict]
- batchDescribeMergeConflictsResponse_destinationCommitId :: Lens' BatchDescribeMergeConflictsResponse Text
- batchDescribeMergeConflictsResponse_sourceCommitId :: Lens' BatchDescribeMergeConflictsResponse Text
Creating a Request
data BatchDescribeMergeConflicts Source #
See: newBatchDescribeMergeConflicts
smart constructor.
BatchDescribeMergeConflicts' | |
|
Instances
newBatchDescribeMergeConflicts Source #
:: Text | |
-> Text |
|
-> Text | |
-> MergeOptionTypeEnum | |
-> 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: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: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:nextToken:BatchDescribeMergeConflicts'
, batchDescribeMergeConflicts_nextToken
- An enumeration token that, when provided in a request, returns the next
batch of the results.
$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.
$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:repositoryName: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).
$sel:mergeOption:BatchDescribeMergeConflicts'
, batchDescribeMergeConflicts_mergeOption
- The merge option or strategy you want to use to merge the code.
Request Lenses
batchDescribeMergeConflicts_filePaths :: Lens' BatchDescribeMergeConflicts (Maybe [Text]) Source #
The path of the target files used to describe the conflicts. If not specified, the default is all conflict files.
batchDescribeMergeConflicts_conflictDetailLevel :: Lens' BatchDescribeMergeConflicts (Maybe ConflictDetailLevelTypeEnum) Source #
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_nextToken :: Lens' BatchDescribeMergeConflicts (Maybe Text) Source #
An enumeration token that, when provided in a request, returns the next batch of the results.
batchDescribeMergeConflicts_maxConflictFiles :: Lens' BatchDescribeMergeConflicts (Maybe Int) Source #
The maximum number of files to include in the output.
batchDescribeMergeConflicts_maxMergeHunks :: Lens' BatchDescribeMergeConflicts (Maybe Int) Source #
The maximum number of merge hunks to include in the output.
batchDescribeMergeConflicts_conflictResolutionStrategy :: Lens' BatchDescribeMergeConflicts (Maybe ConflictResolutionStrategyTypeEnum) Source #
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_repositoryName :: Lens' BatchDescribeMergeConflicts Text Source #
The name of the repository that contains the merge conflicts you want to review.
batchDescribeMergeConflicts_destinationCommitSpecifier :: Lens' BatchDescribeMergeConflicts Text Source #
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 Source #
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 Source #
The merge option or strategy you want to use to merge the code.
Destructuring the Response
data BatchDescribeMergeConflictsResponse Source #
See: newBatchDescribeMergeConflictsResponse
smart constructor.
BatchDescribeMergeConflictsResponse' | |
|
Instances
newBatchDescribeMergeConflictsResponse Source #
:: Int | |
-> Text |
|
-> Text | |
-> 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:nextToken:BatchDescribeMergeConflicts'
, batchDescribeMergeConflictsResponse_nextToken
- An enumeration token that can be used in a request to return the next
batch of the results.
$sel:errors:BatchDescribeMergeConflictsResponse'
, batchDescribeMergeConflictsResponse_errors
- A list of any errors returned while describing the merge conflicts for
each file.
$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.
$sel:destinationCommitId:BatchDescribeMergeConflictsResponse'
, batchDescribeMergeConflictsResponse_destinationCommitId
- The commit ID of the destination commit specifier that was used in the
merge evaluation.
$sel:sourceCommitId: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) Source #
The commit ID of the merge base.
batchDescribeMergeConflictsResponse_nextToken :: Lens' BatchDescribeMergeConflictsResponse (Maybe Text) Source #
An enumeration token that can be used in a request to return the next batch of the results.
batchDescribeMergeConflictsResponse_errors :: Lens' BatchDescribeMergeConflictsResponse (Maybe [BatchDescribeMergeConflictsError]) Source #
A list of any errors returned while describing the merge conflicts for each file.
batchDescribeMergeConflictsResponse_httpStatus :: Lens' BatchDescribeMergeConflictsResponse Int Source #
The response's http status code.
batchDescribeMergeConflictsResponse_conflicts :: Lens' BatchDescribeMergeConflictsResponse [Conflict] Source #
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 Source #
The commit ID of the destination commit specifier that was used in the merge evaluation.
batchDescribeMergeConflictsResponse_sourceCommitId :: Lens' BatchDescribeMergeConflictsResponse Text Source #
The commit ID of the source commit specifier that was used in the merge evaluation.