In our Master branch there is a jenkins file with an old pipeline variable that no longer exists. So in order for me to update the master branch I have to create a release branch from the master branch.
I then am able to edit the jenkins file in the release branch, however when I go to merge the release back to master I get a build failure. The edited release branch builds correctly but since the master branch still has the old jenkins file it fails on its version of the PR to merge.
How can I get around this?
My pull request looks like this
Release#1 - This commit looks good
Master PR#169 - There was a failure building this commit
Welcome to the Community!
Given that you know the problem is an old variable that shouldn't exist anymore, are you not able to temporarily relax the permissions and make a commit directly in the master branch as long as it is documented correctly? That would be my recommended approach for a situation like this.
I hope that helps!
Hi All! We’re excited to share the launch of an announcement banner that lets Jira site administrators communicate directly to their users across their Jira Cloud instance. ...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events