ci: update merge conflict bot to trigger on main

[cheese-cakee]

Description:
Updates the merge conflict detection workflow to recognize conflicts caused by updates to the main branch. Previously, the bot only notified users if the PR itself was updated, missing conflicts caused by external changes in main.

Changes:

• Updated workflow triggers to detect when main updates.
• Ensures users are notified of merge conflicts even if they haven't touched their PR recently.

Related issue(s):
Fixes #913

Notes for reviewer:
This addresses the edge case where a PR becomes conflicted due to changes in the base branch, ensuring the author is still notified.

Checklist

• Documented (Code comments, README, etc.)
• Tested (unit, integration, etc.)

[exploreriii]

Hi @cheese-cakee
Great! Much better, I can work with this - nice one!

One issue I think is that we will never see a failed merge conflict workflow
Right now, you get an X if you have a merge conflict.

By extending it to loop through all issues on push to main, and not letting it fail, we are always going to pass that check, I think.

We want:
✅ If a PR has merge conflicts → its workflow run should fail
✅ If main is updated (push to main) → any PR that now conflicts should also fail in its workflow
✅ No duplicate bot commenting

How can we do that?

[cheese-cakee]

Thanks for the feedback!

Here is my plan to address the three requirements:

For individual PRs: I'll make sure the script exits with an error code (exit 1) if a conflict is found. That will give us the red ❌ immediately on the PR.

For the loop on main: Since we don't want to fail the workflow running on main itself, I think the best move is to use the GitHub Status API to target the specific PR commit and mark it as failed.

For the spam: I'll simply add a check to scan for previous bot comments before posting a new one.

Please let me know what you think about this.

[exploreriii]

excellent ideas!

[cheese-cakee]

am i allowed to switch the implementation from the Bash script to actions/github-script

[exploreriii]

if you are making big changes i would like it to be tested well please 👍

[cheese-cakee]

I have refactored the logic to use actions/github-script and tested all edge cases in my fork.

Test Results:

PR Checks: Conflicted PRs correctly fail the workflow run (Red ❌) and receive a comment.

Push to Main: When a push occurs, the bot scans open PRs and updates their commit status to "Failure" via the API without failing the main workflow run.

No Spam: The bot checks for existing comments and does not double-post.

[cheese-cakee]

also if there are any new issues i would love to work on them ! @exploreriii

[exploreriii]

I am reviewing this currently but we have 4 concurrent bot PRs to review.
Request help to review @MonaaEid @tech0priyanshu @AntonioCeppellini @Adityarya11 if available

[exploreriii]

Hi @cheese-cakee
Thank you for this - there are many good things here, and might solve the issue!

However you have refactored the logic almost entirely so we cannot go and assume this new bot will work

Therefore, the key thing if you do want to submit this, I want to see you test this on your origin fork

1. merge it to main
2. create a pull request 1 with a merge conflict - bot should post
3. create a pull request 2 without a merge conflict - it should not post
4. merge soemthing to main that causes a merge conflcit to pull request 2 - it should now post
5. check maximum nubmer of merge conflict posts is 2

Unfortunately, there are quite a few things to test and it is important to do so otherwise we can risk spamming users and sending incorrect messages

Happy for you to go ahead with this issue if you'd like to do that, however, if you do not want to take on the full work (would be quite a bit to test) happy to reassign or even take it on myself.

[cheese-cakee]

Hi @exploreriii and @MonaaEid , thanks a lot for the detailed feedback !

I definitely want to see this through and implement the refactor + testing myself. I agree that moving the logic to a script and running the 5-step test plan is the right move for stability.

If you agree, I will work on these changes and run the full test suite on my fork over the next day or two. I'll ping you here with the results once it's ready.

[exploreriii]

excellent news! have switched this to draft while its ready to review again

[cheese-cakee]

Hi @exploreriii

I have updated the bot based on the feedback.

Changes Made:

Moved the helper script to .github/scripts/merge_conflict_helpers.js as requested.

Updated the workflow yaml to dynamically locate the script using GITHUB_WORKSPACE, ensuring it works regardless of the runner's path structure.

Testing Verification: I have tested this thoroughly on my fork.

Test 1(Conflict Detected): Verified that the bot successfully detects a conflict and comments on the PR.
Test 2 (No Conflict): Verified that the bot remains silent when there are no conflicts.

[exploreriii]

Hi @cheese-cakee were you able to test if

1. an issue with no conflict
2. once another issue gets merged
3. and issue 1 now has a conflict
4. there is a notification on issue 1?

[exploreriii]

changing to draft while it is ready to review again 👍

[github-actions]

Hi, this is MergeConflictBot.
Your pull request cannot be merged because it contains merge conflicts.

Please resolve these conflicts locally and push the changes.

To assist you, please read:

• Resolving Merge Conflicts
• Rebasing Guide

Thank you for contributing!

From the Hiero Python SDK Team

[cheese-cakee]

Hi @exploreriii

Yes! I verified this exact scenario in a test PR on my fork.

I opened a PR with no conflicts (Bot was silent).
I pushed a conflicting change to main.
I forced the bot to run again.
The bot successfully detected the new conflict and posted the comment. 🎉

I also updated harden-runner to v2.14.0 (the latest release) and just resolved the merge conflicts that popped up with main.

Ready for review!

[exploreriii]

Request review @AntonioCeppellini @MonaaEid @tech0priyanshu if available

stale

[AntonioCeppellini]

I think this two points needs to be reviewed

[github-actions]

Hi, this is WorkflowBot.
Your pull request cannot be merged as it is not passing all our workflow checks.
Please click on each check to review the logs and resolve issues so all checks pass.
To help you:

• DCO signing guide
• Changelog guide
• Merge conflicts guide
• Rebase guide
• Testing guide
• Discord
• Community Calls
  Thank you for contributing!
  From the Hiero Python SDK Team

[exploreriii]

Hi @cheese-cakee
Really great you've been able to test it

Could we add one more safety net?

1. add workflow dispatch, so we can trigger it manually
2. add a dry run variable accepting 0,1,true,false,yes,no
   when triggered manually, defeault to dry mode 1
   when run on dry mode, it should log to console merge conflict messages instead of comment

Also, you'll need a changelog entry!

[exploreriii]

Hi @cheese-cakee please rebase, the tests are fixed now and there shouldn't be a problem :)

[aceppaluni]

Hi @cheese-cakee I've linked our Rebasing.md file for any assistance you may need.

https://github.com/hiero-ledger/hiero-sdk-python/blob/main/docs/sdk_developers/rebasing.md

Please reach out if you have any questions! We are always happy to help!

[github-actions]

Hello, this is the Office Hour Bot.

This is a reminder that the Hiero Python SDK Office Hours are scheduled in approximately 4 hours (14:00 UTC).

This session provides an opportunity to ask questions regarding this Pull Request or receive assistance from a maintainer.

Details:

• Time: 14:00 UTC
• Join Link: Zoom Meeting

Disclaimer: This is an automated reminder. Please verify the schedule here to be notified of any changes.

[aceppaluni]

Hi @cheese-cakee This is looking fantastic!

Here is a link to our documentation on CHANGELOG entries
https://github.com/hiero-ledger/hiero-sdk-python/blob/main/docs/sdk_developers/changelog_entry.md

Below is an example for the changelog entry:
- Updated the merge conflict detection bot to trigger on `main` branch updates and detect conflicts caused by base branch changes. Fixes #913.

I hope this helps!

Please reach out if you have any questions, we are happy to help! :)

[coderabbitai]

Important

Review skipped

Draft detected.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

✨ Finishing touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Post copyable unit tests in a comment

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[github-actions]

[commit-verification-bot]
Hi, this is VerificationBot.
Your pull request cannot be merged as it has unverified commits.
View your commit verification status: Commits Tab.

To achieve verified status, please read:

• Signing guide
• README
• Discord

Remember, you require a GPG key and each commit must be signed with:
git commit -S -s -m "Your message here"

Thank you for contributing!

From the Hiero Python SDK Team

[cheese-cakee]

I have completed the rebase.do i need to do anything more like in the changelog?

also so sorry for the delay!

[exploreriii]

Hi @cheese-cakee great to see you back!
Yes, unfortunately your commits are no longer verified:
https://github.com/hiero-ledger/hiero-sdk-python/pull/970/commits

I would recommend soft reverting them, recommiting with appropriate signatures, then force pushing (first create a backup)

[aceppaluni]

@cheese-cakee If you need assistance with signing your commits, please let us know :)

[github-actions]

Hi @cheese-cakee,

This pull request has had no commit activity for 10 days. Are you still working on the issue? please push a commit to keep the PR active or it will be closed due to inactivity.
Reach out on discord or join our office hours if you need assistance.

• Discord
• Office Hours

From the Python SDK Team