AWS CodeCommit Supports Two Additional Merge Strategies and Merge Conflict Resolution
AWS CodeCommit now supports two additional merge strategies for pull requests: squash merges and three-way merges, and a conflict resolution editor in the console that allows developers to manually resolve conflicts at the time of a merge. A pull request is the primary way developers review, comment on, and merge code changes. Collaboratively reviewing code changes in pull requests helps developers maintain high code quality and better understand each other’s code.
Previously, pull requests in CodeCommit only supported the default Git merge strategy, fast-forward, and did not support merge conflict resolution in the console. These additional merge strategies and conflict resolution functionality allow developers to define complex workflows for reviewing and integrating their code. Developers can use these additional strategies in the AWS CodeCommit console, or programmatically through the APIs, AWS CLI, and SDKs. For more information, see the documentation.