Issue with Cascading Merge and Branch Protection Rules

[snps-annaku]

Hello,

I am encountering an issue when using the ActionsDesk/cascading-downstream-merge action to auto-merge changes from the release branch into the master branch. Here are the details of my scenario:

Current Setup:
I am using the ActionsDesk/cascading-downstream-merge action.
Branch protection rules are enabled on the master branch, requiring PR checks (Require status checks to pass before merging). This setup triggers a GitHub workflow.

Problem:
When the cascading merge action creates a PR from release to master, the PR fails with the message: "Problem with cascading Auto-Merge. Ran into a merge conflict."
There is no actual code conflict. The issue appears to be that the PR check job is not starting at all, which is required for the master branch. Due to this, the merge fails.

Additional Information:
Both the cascading merge action and the PR checks work fine independently.
They fail to work together in the described scenario.
Later, I also need to enable the merge queue option.

Could you please help or provide any suggestions? Maybe I am missing some additional configurations to make them work together. Any insights would be greatly appreciated.

Thank you!
Anna

[snps-annaku]

Hi @ncalteen, @bakosa

Any suggestions?

[ncalteen]

Hi @snps-annaku, can you provide the workflow file you are using? Please make sure to redact any secrets or other sensitive information.

On initial glance, it looks like this is an error related to token permissions. Are you providing a separate merge_token input, as described here?

[snps-annaku]

Hi @ncalteen,

Thanks for the quick response!

Just to share some more context: I was originally using ActionsDesk/cascading-downstream-merge@v1.2.0, and it worked fine in my setup.

After your suggestion, I tried updating to the latest version v3.0.0, but encountered a new issue. The action fails with a 401 Bad Credentials error , even though I’m using the same token that worked with v1.2.0.

I also removed all branch protection rules and re-ran the workflow, but the issue persists.

I’ve opened a separate ticket to track this specific problem here: issue link

Thanks again,
Anna

[ncalteen]

I responded in your other issue, when you have time :) I will keep this open so we can revisit once the other issue is resolved.