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 merge conflicts between the before and after commit IDs for a pull request in a repository.
Synopsis
- data GetMergeConflicts = GetMergeConflicts' {}
- newGetMergeConflicts :: Text -> Text -> Text -> MergeOptionTypeEnum -> GetMergeConflicts
- getMergeConflicts_conflictDetailLevel :: Lens' GetMergeConflicts (Maybe ConflictDetailLevelTypeEnum)
- getMergeConflicts_nextToken :: Lens' GetMergeConflicts (Maybe Text)
- getMergeConflicts_maxConflictFiles :: Lens' GetMergeConflicts (Maybe Int)
- getMergeConflicts_conflictResolutionStrategy :: Lens' GetMergeConflicts (Maybe ConflictResolutionStrategyTypeEnum)
- getMergeConflicts_repositoryName :: Lens' GetMergeConflicts Text
- getMergeConflicts_destinationCommitSpecifier :: Lens' GetMergeConflicts Text
- getMergeConflicts_sourceCommitSpecifier :: Lens' GetMergeConflicts Text
- getMergeConflicts_mergeOption :: Lens' GetMergeConflicts MergeOptionTypeEnum
- data GetMergeConflictsResponse = GetMergeConflictsResponse' {}
- newGetMergeConflictsResponse :: Int -> Bool -> Text -> Text -> GetMergeConflictsResponse
- getMergeConflictsResponse_baseCommitId :: Lens' GetMergeConflictsResponse (Maybe Text)
- getMergeConflictsResponse_nextToken :: Lens' GetMergeConflictsResponse (Maybe Text)
- getMergeConflictsResponse_httpStatus :: Lens' GetMergeConflictsResponse Int
- getMergeConflictsResponse_mergeable :: Lens' GetMergeConflictsResponse Bool
- getMergeConflictsResponse_destinationCommitId :: Lens' GetMergeConflictsResponse Text
- getMergeConflictsResponse_sourceCommitId :: Lens' GetMergeConflictsResponse Text
- getMergeConflictsResponse_conflictMetadataList :: Lens' GetMergeConflictsResponse [ConflictMetadata]
Creating a Request
data GetMergeConflicts Source #
See: newGetMergeConflicts
smart constructor.
GetMergeConflicts' | |
|
Instances
:: Text | |
-> Text | |
-> Text | |
-> MergeOptionTypeEnum | |
-> GetMergeConflicts |
Create a value of GetMergeConflicts
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:GetMergeConflicts'
, getMergeConflicts_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:GetMergeConflicts'
, getMergeConflicts_nextToken
- An enumeration token that, when provided in a request, returns the next
batch of the results.
$sel:maxConflictFiles:GetMergeConflicts'
, getMergeConflicts_maxConflictFiles
- The maximum number of files to include in the output.
$sel:conflictResolutionStrategy:GetMergeConflicts'
, getMergeConflicts_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:GetMergeConflicts'
, getMergeConflicts_repositoryName
- The name of the repository where the pull request was created.
$sel:destinationCommitSpecifier:GetMergeConflicts'
, getMergeConflicts_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:GetMergeConflicts'
, getMergeConflicts_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:GetMergeConflicts'
, getMergeConflicts_mergeOption
- The merge option or strategy you want to use to merge the code.
Request Lenses
getMergeConflicts_conflictDetailLevel :: Lens' GetMergeConflicts (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.
getMergeConflicts_nextToken :: Lens' GetMergeConflicts (Maybe Text) Source #
An enumeration token that, when provided in a request, returns the next batch of the results.
getMergeConflicts_maxConflictFiles :: Lens' GetMergeConflicts (Maybe Int) Source #
The maximum number of files to include in the output.
getMergeConflicts_conflictResolutionStrategy :: Lens' GetMergeConflicts (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.
getMergeConflicts_repositoryName :: Lens' GetMergeConflicts Text Source #
The name of the repository where the pull request was created.
getMergeConflicts_destinationCommitSpecifier :: Lens' GetMergeConflicts 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).
getMergeConflicts_sourceCommitSpecifier :: Lens' GetMergeConflicts 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).
getMergeConflicts_mergeOption :: Lens' GetMergeConflicts MergeOptionTypeEnum Source #
The merge option or strategy you want to use to merge the code.
Destructuring the Response
data GetMergeConflictsResponse Source #
See: newGetMergeConflictsResponse
smart constructor.
GetMergeConflictsResponse' | |
|
Instances
newGetMergeConflictsResponse Source #
:: Int | |
-> Bool | |
-> Text | |
-> Text | |
-> GetMergeConflictsResponse |
Create a value of GetMergeConflictsResponse
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:GetMergeConflictsResponse'
, getMergeConflictsResponse_baseCommitId
- The commit ID of the merge base.
$sel:nextToken:GetMergeConflicts'
, getMergeConflictsResponse_nextToken
- An enumeration token that can be used in a request to return the next
batch of the results.
$sel:httpStatus:GetMergeConflictsResponse'
, getMergeConflictsResponse_httpStatus
- The response's http status code.
$sel:mergeable:GetMergeConflictsResponse'
, getMergeConflictsResponse_mergeable
- A Boolean value that indicates whether the code is mergeable by the
specified merge option.
$sel:destinationCommitId:GetMergeConflictsResponse'
, getMergeConflictsResponse_destinationCommitId
- The commit ID of the destination commit specifier that was used in the
merge evaluation.
$sel:sourceCommitId:GetMergeConflictsResponse'
, getMergeConflictsResponse_sourceCommitId
- The commit ID of the source commit specifier that was used in the merge
evaluation.
$sel:conflictMetadataList:GetMergeConflictsResponse'
, getMergeConflictsResponse_conflictMetadataList
- A list of metadata for any conflicting files. If the specified merge
strategy is FAST_FORWARD_MERGE, this list is always empty.
Response Lenses
getMergeConflictsResponse_baseCommitId :: Lens' GetMergeConflictsResponse (Maybe Text) Source #
The commit ID of the merge base.
getMergeConflictsResponse_nextToken :: Lens' GetMergeConflictsResponse (Maybe Text) Source #
An enumeration token that can be used in a request to return the next batch of the results.
getMergeConflictsResponse_httpStatus :: Lens' GetMergeConflictsResponse Int Source #
The response's http status code.
getMergeConflictsResponse_mergeable :: Lens' GetMergeConflictsResponse Bool Source #
A Boolean value that indicates whether the code is mergeable by the specified merge option.
getMergeConflictsResponse_destinationCommitId :: Lens' GetMergeConflictsResponse Text Source #
The commit ID of the destination commit specifier that was used in the merge evaluation.
getMergeConflictsResponse_sourceCommitId :: Lens' GetMergeConflictsResponse Text Source #
The commit ID of the source commit specifier that was used in the merge evaluation.
getMergeConflictsResponse_conflictMetadataList :: Lens' GetMergeConflictsResponse [ConflictMetadata] Source #
A list of metadata for any conflicting files. If the specified merge strategy is FAST_FORWARD_MERGE, this list is always empty.