You are using the auto-resolve conflict resolution feature, Copado will stop the merge of the feature branch into the promotion branch if it detects a conflict.

You are using the auto-resolve conflict resolution feature, Copado will stop the merge of the feature branch into the promotion branch if it detects a conflict.
A . True
B . False (I think this is correct, because in auto resolve copado merge it when there is conflict)

Answer: B