Amazonka.CodeCommit.DescribeMergeConflicts

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.

Creating a Request

data DescribeMergeConflicts

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.

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

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

ToJSON DescribeMergeConflicts

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Methods

toJSON :: DescribeMergeConflicts -> Value

toEncoding :: DescribeMergeConflicts -> Encoding

toJSONList :: [DescribeMergeConflicts] -> Value

toEncodingList :: [DescribeMergeConflicts] -> Encoding

ToHeaders DescribeMergeConflicts

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Methods

toHeaders :: DescribeMergeConflicts -> [Header]

ToPath DescribeMergeConflicts

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Methods

toPath :: DescribeMergeConflicts -> ByteString

ToQuery DescribeMergeConflicts

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Methods

toQuery :: DescribeMergeConflicts -> QueryString

AWSRequest DescribeMergeConflicts

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Associated Types

type AWSResponse DescribeMergeConflicts

Methods

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

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

Generic DescribeMergeConflicts

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Associated Types

type Rep DescribeMergeConflicts :: Type -> Type

Methods

from :: DescribeMergeConflicts -> Rep DescribeMergeConflicts x

to :: Rep DescribeMergeConflicts x -> DescribeMergeConflicts

Read DescribeMergeConflicts

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Methods

readsPrec :: Int -> ReadS DescribeMergeConflicts

readList :: ReadS [DescribeMergeConflicts]

readPrec :: ReadPrec DescribeMergeConflicts

readListPrec :: ReadPrec [DescribeMergeConflicts]

Show DescribeMergeConflicts

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Methods

showsPrec :: Int -> DescribeMergeConflicts -> ShowS

show :: DescribeMergeConflicts -> String

showList :: [DescribeMergeConflicts] -> ShowS

NFData DescribeMergeConflicts

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Methods

rnf :: DescribeMergeConflicts -> ()

Eq DescribeMergeConflicts

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Methods

(==) :: DescribeMergeConflicts -> DescribeMergeConflicts -> Bool

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

Hashable DescribeMergeConflicts

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Methods

hashWithSalt :: Int -> DescribeMergeConflicts -> Int

hash :: DescribeMergeConflicts -> Int

type AWSResponse DescribeMergeConflicts

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

type AWSResponse DescribeMergeConflicts = DescribeMergeConflictsResponse

type Rep DescribeMergeConflicts

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

type Rep DescribeMergeConflicts = D1 ('MetaData "DescribeMergeConflicts" "Amazonka.CodeCommit.DescribeMergeConflicts" "amazonka-codecommit-2.0-974g5LOhuTPG9HgUSx02zG" 'False) (C1 ('MetaCons "DescribeMergeConflicts'" '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 "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) :*: S1 ('MetaSel ('Just "filePath") 'NoSourceUnpackedness 'NoSourceStrictness 'DecidedStrict) (Rec0 Text))))))

newDescribeMergeConflicts

Arguments

:: Text

DescribeMergeConflicts

-> Text

$sel:destinationCommitSpecifier:DescribeMergeConflicts'

-> Text

$sel:sourceCommitSpecifier:DescribeMergeConflicts'

-> MergeOptionTypeEnum

DescribeMergeConflicts

-> Text

DescribeMergeConflicts

-> 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: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:maxMergeHunks:DescribeMergeConflicts', describeMergeConflicts_maxMergeHunks - The maximum number of merge hunks to include in the output.

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

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

DescribeMergeConflicts, describeMergeConflicts_mergeOption - The merge option or strategy you want to use to merge the code.

DescribeMergeConflicts, describeMergeConflicts_filePath - The path of the target files used to describe the conflicts.

Request Lenses

describeMergeConflicts_conflictDetailLevel :: Lens' DescribeMergeConflicts (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.

describeMergeConflicts_conflictResolutionStrategy :: Lens' DescribeMergeConflicts (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.

describeMergeConflicts_maxMergeHunks :: Lens' DescribeMergeConflicts (Maybe Int)

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

describeMergeConflicts_nextToken :: Lens' DescribeMergeConflicts (Maybe Text)

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

describeMergeConflicts_repositoryName :: Lens' DescribeMergeConflicts Text

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

describeMergeConflicts_destinationCommitSpecifier :: Lens' DescribeMergeConflicts 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).

describeMergeConflicts_sourceCommitSpecifier :: Lens' DescribeMergeConflicts 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).

describeMergeConflicts_mergeOption :: Lens' DescribeMergeConflicts MergeOptionTypeEnum

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

describeMergeConflicts_filePath :: Lens' DescribeMergeConflicts Text

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

Destructuring the Response

data DescribeMergeConflictsResponse

See: newDescribeMergeConflictsResponse smart constructor.

Constructors

DescribeMergeConflictsResponse'

Fields

• baseCommitId :: Maybe Text

  The commit ID of the merge base.

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

• conflictMetadata :: ConflictMetadata

  Contains metadata about the conflicts found in the merge.

• mergeHunks :: [MergeHunk]

  A list of merge hunks of the differences between the files or lines.

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

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Associated Types

type Rep DescribeMergeConflictsResponse :: Type -> Type

Methods

from :: DescribeMergeConflictsResponse -> Rep DescribeMergeConflictsResponse x

to :: Rep DescribeMergeConflictsResponse x -> DescribeMergeConflictsResponse

Read DescribeMergeConflictsResponse

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Methods

readsPrec :: Int -> ReadS DescribeMergeConflictsResponse

readList :: ReadS [DescribeMergeConflictsResponse]

readPrec :: ReadPrec DescribeMergeConflictsResponse

readListPrec :: ReadPrec [DescribeMergeConflictsResponse]

Show DescribeMergeConflictsResponse

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Methods

showsPrec :: Int -> DescribeMergeConflictsResponse -> ShowS

show :: DescribeMergeConflictsResponse -> String

showList :: [DescribeMergeConflictsResponse] -> ShowS

NFData DescribeMergeConflictsResponse

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Methods

rnf :: DescribeMergeConflictsResponse -> ()

Eq DescribeMergeConflictsResponse

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

Methods

(==) :: DescribeMergeConflictsResponse -> DescribeMergeConflictsResponse -> Bool

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

type Rep DescribeMergeConflictsResponse

Defined in Amazonka.CodeCommit.DescribeMergeConflicts

type Rep DescribeMergeConflictsResponse = D1 ('MetaData "DescribeMergeConflictsResponse" "Amazonka.CodeCommit.DescribeMergeConflicts" "amazonka-codecommit-2.0-974g5LOhuTPG9HgUSx02zG" '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

Arguments

:: Int

$sel:httpStatus:DescribeMergeConflictsResponse'

-> ConflictMetadata

DescribeMergeConflictsResponse

-> Text

DescribeMergeConflictsResponse

-> Text

DescribeMergeConflictsResponse

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

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.

DescribeMergeConflictsResponse, describeMergeConflictsResponse_conflictMetadata - Contains metadata about the conflicts found in the merge.

DescribeMergeConflictsResponse, describeMergeConflictsResponse_mergeHunks - A list of merge hunks of the differences between the files or lines.

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

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)

The commit ID of the merge base.

describeMergeConflictsResponse_nextToken :: Lens' DescribeMergeConflictsResponse (Maybe Text)

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

describeMergeConflictsResponse_httpStatus :: Lens' DescribeMergeConflictsResponse Int

The response's http status code.

describeMergeConflictsResponse_conflictMetadata :: Lens' DescribeMergeConflictsResponse ConflictMetadata

Contains metadata about the conflicts found in the merge.

describeMergeConflictsResponse_mergeHunks :: Lens' DescribeMergeConflictsResponse [MergeHunk]

A list of merge hunks of the differences between the files or lines.

describeMergeConflictsResponse_destinationCommitId :: Lens' DescribeMergeConflictsResponse Text

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

describeMergeConflictsResponse_sourceCommitId :: Lens' DescribeMergeConflictsResponse Text

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