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

Auto-Merge - not resolves conflicts

claudiu June 25, 2018

hi,

Any option required to be activated  for Auto-Merged to be able to resolve conflicts (to create the additional PR for fixing them)

In my case it skip the merges into the release branches or master in case of conflicts. Will merge only the branches without conflicts.

1 answer

0 votes
Felipe Kraemer
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
July 2, 2018

Hi @claudiu,

According to Automatic branch merging there are a few conditions that must be satisfied for the conflict to be resolved.

Can you please make sure that these conditions are being satisfied in your use case?

Cheers,

Felipe

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events