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. If the merge option for the attempted merge is specified as FAST_FORWARD_MERGE, an exception is thrown.
Synopsis
- data DescribeMergeConflicts = DescribeMergeConflicts' {
- conflictDetailLevel :: Maybe ConflictDetailLevelTypeEnum
- nextToken :: Maybe Text
- maxMergeHunks :: Maybe Int
- conflictResolutionStrategy :: Maybe ConflictResolutionStrategyTypeEnum
- repositoryName :: Text
- destinationCommitSpecifier :: Text
- sourceCommitSpecifier :: Text
- mergeOption :: MergeOptionTypeEnum
- filePath :: Text
- newDescribeMergeConflicts :: Text -> Text -> Text -> MergeOptionTypeEnum -> Text -> DescribeMergeConflicts
- describeMergeConflicts_conflictDetailLevel :: Lens' DescribeMergeConflicts (Maybe ConflictDetailLevelTypeEnum)
- describeMergeConflicts_nextToken :: Lens' DescribeMergeConflicts (Maybe Text)
- describeMergeConflicts_maxMergeHunks :: Lens' DescribeMergeConflicts (Maybe Int)
- describeMergeConflicts_conflictResolutionStrategy :: Lens' DescribeMergeConflicts (Maybe ConflictResolutionStrategyTypeEnum)
- describeMergeConflicts_repositoryName :: Lens' DescribeMergeConflicts Text
- describeMergeConflicts_destinationCommitSpecifier :: Lens' DescribeMergeConflicts Text
- describeMergeConflicts_sourceCommitSpecifier :: Lens' DescribeMergeConflicts Text
- describeMergeConflicts_mergeOption :: Lens' DescribeMergeConflicts MergeOptionTypeEnum
- describeMergeConflicts_filePath :: Lens' DescribeMergeConflicts Text
- data DescribeMergeConflictsResponse = DescribeMergeConflictsResponse' {}
- newDescribeMergeConflictsResponse :: Int -> ConflictMetadata -> Text -> Text -> DescribeMergeConflictsResponse
- describeMergeConflictsResponse_baseCommitId :: Lens' DescribeMergeConflictsResponse (Maybe Text)
- describeMergeConflictsResponse_nextToken :: Lens' DescribeMergeConflictsResponse (Maybe Text)
- describeMergeConflictsResponse_httpStatus :: Lens' DescribeMergeConflictsResponse Int
- describeMergeConflictsResponse_conflictMetadata :: Lens' DescribeMergeConflictsResponse ConflictMetadata
- describeMergeConflictsResponse_mergeHunks :: Lens' DescribeMergeConflictsResponse [MergeHunk]
- describeMergeConflictsResponse_destinationCommitId :: Lens' DescribeMergeConflictsResponse Text
- describeMergeConflictsResponse_sourceCommitId :: Lens' DescribeMergeConflictsResponse Text
Creating a Request
data DescribeMergeConflicts Source #
See: newDescribeMergeConflicts
smart constructor.
DescribeMergeConflicts' | |
|
Instances
newDescribeMergeConflicts Source #
:: Text | |
-> Text | |
-> Text | |
-> MergeOptionTypeEnum | |
-> Text | |
-> DescribeMergeConflicts |
Create a value of DescribeMergeConflicts
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:DescribeMergeConflicts'
, describeMergeConflicts_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:DescribeMergeConflicts'
, describeMergeConflicts_nextToken
- An enumeration token that, when provided in a request, returns the next
batch of the results.
$sel:maxMergeHunks:DescribeMergeConflicts'
, describeMergeConflicts_maxMergeHunks
- The maximum number of merge hunks to include in the output.
$sel:conflictResolutionStrategy:DescribeMergeConflicts'
, describeMergeConflicts_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:DescribeMergeConflicts'
, describeMergeConflicts_repositoryName
- The name of the repository where you want to get information about a
merge conflict.
$sel:destinationCommitSpecifier:DescribeMergeConflicts'
, describeMergeConflicts_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:DescribeMergeConflicts'
, describeMergeConflicts_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:DescribeMergeConflicts'
, describeMergeConflicts_mergeOption
- The merge option or strategy you want to use to merge the code.
$sel:filePath:DescribeMergeConflicts'
, describeMergeConflicts_filePath
- The path of the target files used to describe the conflicts.
Request Lenses
describeMergeConflicts_conflictDetailLevel :: Lens' DescribeMergeConflicts (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.
describeMergeConflicts_nextToken :: Lens' DescribeMergeConflicts (Maybe Text) Source #
An enumeration token that, when provided in a request, returns the next batch of the results.
describeMergeConflicts_maxMergeHunks :: Lens' DescribeMergeConflicts (Maybe Int) Source #
The maximum number of merge hunks to include in the output.
describeMergeConflicts_conflictResolutionStrategy :: Lens' DescribeMergeConflicts (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.
describeMergeConflicts_repositoryName :: Lens' DescribeMergeConflicts Text Source #
The name of the repository where you want to get information about a merge conflict.
describeMergeConflicts_destinationCommitSpecifier :: Lens' DescribeMergeConflicts 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).
describeMergeConflicts_sourceCommitSpecifier :: Lens' DescribeMergeConflicts 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).
describeMergeConflicts_mergeOption :: Lens' DescribeMergeConflicts MergeOptionTypeEnum Source #
The merge option or strategy you want to use to merge the code.
describeMergeConflicts_filePath :: Lens' DescribeMergeConflicts Text Source #
The path of the target files used to describe the conflicts.
Destructuring the Response
data DescribeMergeConflictsResponse Source #
See: newDescribeMergeConflictsResponse
smart constructor.
DescribeMergeConflictsResponse' | |
|
Instances
newDescribeMergeConflictsResponse Source #
:: Int | |
-> ConflictMetadata | |
-> Text | |
-> Text | |
-> DescribeMergeConflictsResponse |
Create a value of DescribeMergeConflictsResponse
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:DescribeMergeConflictsResponse'
, describeMergeConflictsResponse_baseCommitId
- The commit ID of the merge base.
$sel:nextToken:DescribeMergeConflicts'
, describeMergeConflictsResponse_nextToken
- An enumeration token that can be used in a request to return the next
batch of the results.
$sel:httpStatus:DescribeMergeConflictsResponse'
, describeMergeConflictsResponse_httpStatus
- The response's http status code.
$sel:conflictMetadata:DescribeMergeConflictsResponse'
, describeMergeConflictsResponse_conflictMetadata
- Contains metadata about the conflicts found in the merge.
$sel:mergeHunks:DescribeMergeConflictsResponse'
, describeMergeConflictsResponse_mergeHunks
- A list of merge hunks of the differences between the files or lines.
$sel:destinationCommitId:DescribeMergeConflictsResponse'
, describeMergeConflictsResponse_destinationCommitId
- The commit ID of the destination commit specifier that was used in the
merge evaluation.
$sel:sourceCommitId:DescribeMergeConflictsResponse'
, describeMergeConflictsResponse_sourceCommitId
- The commit ID of the source commit specifier that was used in the merge
evaluation.
Response Lenses
describeMergeConflictsResponse_baseCommitId :: Lens' DescribeMergeConflictsResponse (Maybe Text) Source #
The commit ID of the merge base.
describeMergeConflictsResponse_nextToken :: Lens' DescribeMergeConflictsResponse (Maybe Text) Source #
An enumeration token that can be used in a request to return the next batch of the results.
describeMergeConflictsResponse_httpStatus :: Lens' DescribeMergeConflictsResponse Int Source #
The response's http status code.
describeMergeConflictsResponse_conflictMetadata :: Lens' DescribeMergeConflictsResponse ConflictMetadata Source #
Contains metadata about the conflicts found in the merge.
describeMergeConflictsResponse_mergeHunks :: Lens' DescribeMergeConflictsResponse [MergeHunk] Source #
A list of merge hunks of the differences between the files or lines.
describeMergeConflictsResponse_destinationCommitId :: Lens' DescribeMergeConflictsResponse Text Source #
The commit ID of the destination commit specifier that was used in the merge evaluation.
describeMergeConflictsResponse_sourceCommitId :: Lens' DescribeMergeConflictsResponse Text Source #
The commit ID of the source commit specifier that was used in the merge evaluation.