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