merge-conflict-example Example repo to demonstrate how to handle merge conflicts. There will be a conflict here: BAZ A newer change here