Octocat merge message for conflicts?

[chrisarcand]

I have not given a ton of thought into how one would accomplish this, but if anyone has time perhaps we should see about adding automated messages ( Merged into staging.2014.07.04) for when merges happen with conflicts. Currently if you have a schema conflict or something and stage up, you won't get the convenient comment in your PR letting people know it's been staged (or restaged). I often add the comment manually now.

Perhaps a simple parsing of the commit message for a merge would be sufficient.

[jerickson]

Also, it seems like octopolo should not add the deployable label to a PR when a merge conflict prevents the deployable command from completing without errors. I'm sure the same is true for the other octopolo commands that add labels to PR's.

[anfleene]

I agree this is pretty annoying.

[chrisarcand]

A few notes for when somebody takes this:

1. The original issue of staging comments with conflicts is still outstanding; This block's steps need to fail gracefully: https://github.com/sportngin/octopolo/blob/master/lib/octopolo/pull_request_merger.rb#L39
2. The deployable label issue mentioned by @jerickson should be fixed (or refactored anyway) in More helpful errors / Refactor Deployable script #43