Twindle: Auto assign merge conflict label

[proful]

• "merge conflict" label should be auto-assigned

• PR should be assigned back to the original author

• mention the author
  "@proful please fix the merge conflict"

[arthurbuhl]

We can also look into this GitHub action which checks all open Pull Requests for merge conflicts and marks them with a Github label. Also, once a conflict is resolved the label is automatically removed.

https://github.com/marketplace/actions/auto-label-merge-conflicts

[johnjacobkenny]

I'm looking into this and #407

[johnjacobkenny]

I have tried to integrate some sample actions in /.github/workflows/. It's not really working out.

There seems to be some limitations with the github workflow as documented here
https://github.community/t/github-actions-are-severely-limited-on-prs/18179/2

I don't know if that is the cause. Does anyone have some experience with this

[arthurbuhl]

In PR #425 it seems to work fine.

Also, can you try updating the yml code like:

on:
  pull_request:
    branches:
      - main

instead of

on:
  pull_request_target:
    branches: [ main ]

Docs: https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows#example-using-multiple-events-with-activity-types-or-configuration

[johnjacobkenny]

@arthurbuhl I think the action is working. I didn't make this change yet.