How to merge two branches using the squash merge strategy in AWS CodeCommit

Question

Hi Guys,

I have two branches in the AWS CodeCommit repository. I made some changes in the master branch. Now I am trying to merge the two branches. But it is showing merge conflicts. How can I merge two branches using the squash merge strategy?

Answer 1

Hi@akhtar,

You can merge two branches using the squash merge strategy. The following merge-branches-by-squash example merges the specified source branch with the specified destination branch in a repository named MyDemoRepo.

$ aws codecommit merge-branches-by-squash \
    --source-commit-specifier bug1 \
    --destination-commit-specifier bug2 \
    --author-name "Maria Garcia" \
    --email "xxxxx@example.com" \
    --commit-message "Merging two fix branches to prepare for a general patch." \
    --repository-name MyDemoRepo