I have a very specific question and I’m hoping someone can help.
Given the following scenario
- 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