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

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

Navin Leon March 19, 2020

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
AUG Leaders

Atlassian Community Events