libZSservicesZSamazonka-codecommitZSamazonka-codecommit
Copyright(c) 2013-2021 Brendan Hay
LicenseMozilla Public License, v. 2.0.
MaintainerBrendan Hay <brendan.g.hay+amazonka@gmail.com>
Stabilityauto-generated
Portabilitynon-portable (GHC extensions)
Safe HaskellNone

Amazonka.CodeCommit.DescribeMergeConflicts

Description

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

Creating a Request

data DescribeMergeConflicts Source #

See: newDescribeMergeConflicts smart constructor.

Constructors

DescribeMergeConflicts' 

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.

  • nextToken :: Maybe Text

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

  • maxMergeHunks :: Maybe Int

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

  • 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.

  • repositoryName :: Text

    The name of the repository where you want to get information about a merge conflict.

  • 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.

  • filePath :: Text

    The path of the target files used to describe the conflicts.

Instances

Instances details
Eq DescribeMergeConflicts Source # 
Instance details

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Read DescribeMergeConflicts Source # 
Instance details

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Show DescribeMergeConflicts Source # 
Instance details

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Generic DescribeMergeConflicts Source # 
Instance details

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Associated Types

type Rep DescribeMergeConflicts :: Type -> Type #

NFData DescribeMergeConflicts Source # 
Instance details

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Methods

rnf :: DescribeMergeConflicts -> () #

Hashable DescribeMergeConflicts Source # 
Instance details

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

ToJSON DescribeMergeConflicts Source # 
Instance details

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

AWSRequest DescribeMergeConflicts Source # 
Instance details

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Associated Types

type AWSResponse DescribeMergeConflicts #

ToHeaders DescribeMergeConflicts Source # 
Instance details

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

ToPath DescribeMergeConflicts Source # 
Instance details

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

ToQuery DescribeMergeConflicts Source # 
Instance details

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

type Rep DescribeMergeConflicts Source # 
Instance details

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

type Rep DescribeMergeConflicts = D1 ('MetaData "DescribeMergeConflicts" "Amazonka.CodeCommit.DescribeMergeConflicts" "libZSservicesZSamazonka-codecommitZSamazonka-codecommit" 'False) (C1 ('MetaCons "DescribeMergeConflicts'" 'PrefixI 'True) (((S1 ('MetaSel ('Just "conflictDetailLevel") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe ConflictDetailLevelTypeEnum)) :*: S1 ('MetaSel ('Just "nextToken") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe Text))) :*: (S1 ('MetaSel ('Just "maxMergeHunks") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe Int)) :*: S1 ('MetaSel ('Just "conflictResolutionStrategy") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe ConflictResolutionStrategyTypeEnum)))) :*: ((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) :*: S1 ('MetaSel ('Just "filePath") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 Text))))))
type AWSResponse DescribeMergeConflicts Source # 
Instance details

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

newDescribeMergeConflicts Source #

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.

Constructors

DescribeMergeConflictsResponse' 

Fields

Instances

Instances details
Eq DescribeMergeConflictsResponse Source # 
Instance details

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Read DescribeMergeConflictsResponse Source # 
Instance details

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Show DescribeMergeConflictsResponse Source # 
Instance details

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Generic DescribeMergeConflictsResponse Source # 
Instance details

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Associated Types

type Rep DescribeMergeConflictsResponse :: Type -> Type #

NFData DescribeMergeConflictsResponse Source # 
Instance details

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

type Rep DescribeMergeConflictsResponse Source # 
Instance details

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

type Rep DescribeMergeConflictsResponse = D1 ('MetaData "DescribeMergeConflictsResponse" "Amazonka.CodeCommit.DescribeMergeConflicts" "libZSservicesZSamazonka-codecommitZSamazonka-codecommit" 'False) (C1 ('MetaCons "DescribeMergeConflictsResponse'" 'PrefixI 'True) ((S1 ('MetaSel ('Just "baseCommitId") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe Text)) :*: (S1 ('MetaSel ('Just "nextToken") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 (Maybe Text)) :*: S1 ('MetaSel ('Just "httpStatus") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 Int))) :*: ((S1 ('MetaSel ('Just "conflictMetadata") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 ConflictMetadata) :*: S1 ('MetaSel ('Just "mergeHunks") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 [MergeHunk])) :*: (S1 ('MetaSel ('Just "destinationCommitId") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 Text) :*: S1 ('MetaSel ('Just "sourceCommitId") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 Text)))))

newDescribeMergeConflictsResponse Source #

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_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_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.