How to merge two branches using the fast-forward merge strategy in AWS CodeCommit

Question

Hi Team,

I have two branches in AWS CodeCommit. But I am trying to merge the branches. But it shows conflicts. How can I merge conflicts using the fast-forward merge strategy?

Answer 1

Hi@akhtar,

The following merge-branches-by-fast-forward example merges the specified source branch with the specified destination branch in a repository named MyDemoRepo.

$ aws codecommit merge-branches-by-fast-forward \
    --source-commit-specifier bugfix-bug1234 \
    --destination-commit-specifier bugfix-bug1233 \
    --repository-name MyDemoRepo