CmdID

CmdID / aws / aws codecommit

aws codecommit 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. AWS CLI reference

8 options Its page in the AWS CLI reference

Opens CmdID with your command. It is read in your browser and sent nowhere.

Options

8 in the AWS CLI reference
--conflict-detail-levelThe level of conflict detail to use.
--conflict-resolution-strategySpecifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file.
--destination-commit-specifier, --source-commit-specifierThe branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).
--file-pathThe path of the target files used to describe the conflicts.
--max-merge-hunksThe maximum number of merge hunks to include in the output.
--merge-optionThe merge option or strategy you want to use to merge the code.
--next-tokenAn enumeration token that, when provided in a request, returns the next batch of the results.
--repository-nameThe name of the repository where you want to get information about a merge conflict.