Create
cancel
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

Do not reset approvals if the only change is resolving conflict merge commit

Hi Team,

I need help for this scenario, when a Pull Request has all approvals and later due to other merges toward master, the current pull request resulted in conflict. Now, when the developer resolves the conflict and commits the code, all the approvals are gone and I have the below enabled in the settings(see screenshot).

I'm wondering is there a way not to reset approvals if the only change is resolving conflict merge commit?

 

2020-03-19_0159.png

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Bitbucket

Powering DevOps with Bitbucket Server & Data Center

Hi everyone, The Cloud team recently announced 12 new DevOps features that help developers ship better code, faster   ! While we’re all excited about the new improvements to Bitbucket ...

1,787 views 0 7
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