Branching workflow question

Hi all,

I have a very specific question and I’m hoping someone can help.

Given the following scenario

  • feature_branches(n)
  • develop
  • release_x (from develop including a commit for a bug fix not present in develop)
  • master (from release_x)

now they never merge release_x back to develop so eventually master is obviously out of sync with develop on the basis that that bug_fix that made it into release_x is not wanted into develop.

So what would be a good approach in the above situation where you have cut a release that has commits you don’t want into master whilst it not complaining about its base branch being different?

Thanks in advance

@freak27,

So what would be a good approach in the above situation where you have cut a release that has commits you don’t want into master whilst it not complaining about its base branch being different?

From your comments, we seems can’t find any points or questions that are related to GitHub Actions.

Please provide more details about the specific questions or problems you are facing when using GitHub Actions workflow in your repository.