merge_conflicts

Creates, updates, deletes, gets or lists a merge_conflicts resource.

Overview

Name	merge_conflicts
Type	Resource
Id	aws.codecommit.merge_conflicts

Fields

The following fields are returned by SELECT queries:

describe_merge_conflicts

Name	Datatype	Description
base_commit_id	string	The commit ID of the merge base.
conflict_metadata	object	Contains metadata about the conflicts found in the merge.
destination_commit_id	string	The commit ID of the destination commit specifier that was used in the merge evaluation.
merge_hunks	array	A list of merge hunks of the differences between the files or lines.
next_token	string	An enumeration token that can be used in a request to return the next batch of the results.
source_commit_id	string	The commit ID of the source commit specifier that was used in the merge evaluation.

get_merge_conflicts

Name	Datatype	Description
base_commit_id	string	The commit ID of the merge base.
conflict_metadata_list	array	A list of metadata for any conflicting files. If the specified merge strategy is FAST_FORWARD_MERGE, this list is always empty.
destination_commit_id	string	The commit ID of the destination commit specifier that was used in the merge evaluation.
mergeable	boolean	A Boolean value that indicates whether the code is mergeable by the specified merge option.
next_token	string	An enumeration token that can be used in a request to return the next batch of the results.
source_commit_id	string	The commit ID of the source commit specifier that was used in the merge evaluation.

Methods

The following methods are available for this resource:

Name	Accessible by	Required Params	Optional Params	Description
describe_merge_conflicts	select	region		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.
get_merge_conflicts	select	region		Returns information about merge conflicts between the before and after commit IDs for a pull request in a repository.
batch_describe_merge_conflicts	exec	region, repositoryName, destinationCommitSpecifier, sourceCommitSpecifier, mergeOption		Returns information about one or more merge conflicts in the attempted merge of two commit specifiers using the squash or three-way merge strategy.

Parameters

Parameters can be passed in the WHERE clause of a query. Check the Methods section to see which parameters are required or optional for each operation.

Name	Datatype	Description
region	string	AWS region (default: us-east-1)

SELECT examples

describe_merge_conflicts

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.

SELECT
base_commit_id,
conflict_metadata,
destination_commit_id,
merge_hunks,
next_token,
source_commit_id
FROM aws.codecommit.merge_conflicts
WHERE region = '{{ region }}' -- required
;

get_merge_conflicts

Returns information about merge conflicts between the before and after commit IDs for a pull request in a repository.

SELECT
base_commit_id,
conflict_metadata_list,
destination_commit_id,
mergeable,
next_token,
source_commit_id
FROM aws.codecommit.merge_conflicts
WHERE region = '{{ region }}' -- required
;

Lifecycle Methods

batch_describe_merge_conflicts

Returns information about one or more merge conflicts in the attempted merge of two commit specifiers using the squash or three-way merge strategy.

EXEC aws.codecommit.merge_conflicts.batch_describe_merge_conflicts 
@region='{{ region }}' --required 
@@json=
'{
"repositoryName": "{{ repositoryName }}", 
"destinationCommitSpecifier": "{{ destinationCommitSpecifier }}", 
"sourceCommitSpecifier": "{{ sourceCommitSpecifier }}", 
"mergeOption": "{{ mergeOption }}", 
"maxMergeHunks": {{ maxMergeHunks }}, 
"maxConflictFiles": {{ maxConflictFiles }}, 
"filePaths": "{{ filePaths }}", 
"conflictDetailLevel": "{{ conflictDetailLevel }}", 
"conflictResolutionStrategy": "{{ conflictResolutionStrategy }}", 
"nextToken": "{{ nextToken }}"
}'
;