Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

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

How do you resolve conflicts with a protected branch?

I have two release branches that have been running parallel for quite some time. The time has come now for release/1.0.0 to be merged into release/2.0.0. The release/1.0.0 branch will go away. 

When I open a pull request, I get a merge conflict. I would like to resolve the merge conflict but the project policy protects release branches from modification without pull requests. 

Is there a way to setup a policy that allows merge commits to be an exception to this rule? I know I can create a conflict resolution branch and then merge that branch into release/2.0.0 but then there is a superfluous branch that then needs to be merged into the release/2.0.0 branch. 

0 answers

Suggest an answer

Log in or Sign up to answer
Community showcase
Published in Atlassian Cloud Migration

Cloud Migration preparatory checklist_Atlympics ✈

Hello Cloud migration Atlympics, This post is my entry into the #Atlympics Cloud migrations category. While, I don't boast myself as I have did or doing migrations, but this request came from o...

24 views 0 1
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