search

gr2m / merge-schedule-action

GitHub Action to merge pull requests on a scheduled day
ISC License
143 stars 36 forks source link

Post a comment with an explenation when a pull request cannot be merged on schedule #67

Closed lloydjatkinson closed 2 years ago

lloydjatkinson commented 2 years ago

Hi, I really like the look of this action, thanks for making it! Just wondering what happens in the case that a merge conflict arises?

gr2m commented 2 years ago

The pull request won't be merged.

Now that we use comments, I wonder if we should post a comment if the merge time passed and the pull request cannot be merged? @ruisaraiva19

ruisaraiva19 commented 2 years ago

The pull request won't be merged.

Now that we use comments, I wonder if we should post a comment if the merge time passed and the pull request cannot be merged? @ruisaraiva19

Yes, we can definitely post a comment with a contextualized message :wink:

gr2m commented 2 years ago

great, I updated the issue title accordingly 👍🏼

ruisaraiva19 commented 2 years ago

@gr2m Can we reuse the same comment that we already have or should we just create a new one for this scenario?

gr2m commented 2 years ago

I'd say post a new one, that will trigger a notification. Updating an existing comment does not.

But just like with the other, only post the comment once. I wonder if we should also add a label such as automerge-fail and not try again when the label is set. We could say in the comment that in order to let the automerge-automation try again, the label should be removed.

ruisaraiva19 commented 2 years ago

Yeah, that sounds good.

gr2m commented 2 years ago

:tada: This issue has been resolved in version 2.2.0 :tada:

The release is available on GitHub release

Your semantic-release bot :package::rocket:

gr2m commented 2 years ago

:tada: This issue has been resolved in version 2.3.0 :tada:

The release is available on GitHub release

Your semantic-release bot :package::rocket: