Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
0 / 0 points
Next:
badges earned

Your Points Tracker
Challenges
Leaderboard
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Recognition
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Kudos
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Merging from master branch has old error

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

1 answer

1 accepted

0 votes
Answer accepted
Jimmy Seddon Community Leader Nov 06, 2019

Hi @Terrance Jackson,

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!

-Jimmy

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase

All you wanted to know about customer support KPIs

When working in customer support, it’s crucial to calculate, analyze and monitor specific numbers, called KPIs (Key Performance Indicators). They go hand-in-hand with customer satisfaction, problem d...

122 views 1 5
Read article

Community Events

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

Events near you