create global workflow that informs PR author about merge conflicts

[derberg]

Reason/Context

Sometimes PRs get merge conflicts. No notifications tell the PR creator about it. This causes some PRs to hang for some time. It affects release branches the most

Description

We need workflow, that once it detects merge conflict on a PR, it posts a comment in PR and mentions the author. The comment should inform the author that there is a merge conflict (this will trigger notification).

It should not be annoying and duplicate comments, so we can inspire on #175 and:

• put new comments only if non exists so far
• delete comment if merge conflict is resolved

Bonus:
Maybe some tips on what is the best way to solve the merge conflict 🤔 good and bad practices.

Super bonus:
Additional workflow that anyone can trigger by adding comments like /rebase or /solve_conflict (/sf) would trigger a workflow that tries to solve the conflict in an automated way. Something to explore

[github-actions]

This issue has been automatically marked as stale because it has not had recent activity 😴

It will be closed in 120 days if no further activity occurs. To unstale this issue, add a comment with a detailed explanation.

There can be many reasons why some specific issue has no activity. The most probable cause is lack of time, not lack of interest. AsyncAPI Initiative is a Linux Foundation project not owned by a single for-profit company. It is a community-driven initiative ruled under open governance model.

Let us figure out together how to push this issue forward. Connect with us through one of many communication channels we established here.

Thank you for your patience ❤️

[sambhavgupta0705]

Hey @derberg ,I would like to work on this issue.

[derberg]

@sambhavgupta0705 please go ahead

[chinma-yyy]

Hey @sambhavgupta0705 are you still working on this?

[sambhavgupta0705]

No ,@chinma-yyy

[chinma-yyy]

No ,@chinma-yyy

Hey @derberg , I would like to work on this issue. Should I go ahead?

[derberg]

sure, please

[chinma-yyy]

sure, please

Yup, sorry for late reply was on a vacation lately ✌️