AWS adds conflict resolution, squash merge to its GitHub homage CodeCommit

Good - if you're eye-deep in Amazon's cloud, that is

Amazon Web Services (AWS) has added key features to the console and API for its source code repository, CodeCommit."