@Saroun
I may not be completely undertanding you, but as a rule, conflicts should be fixed in the branch before merging back to trunk.
« Back to merge proposal
@Saroun
I may not be completely undertanding you, but as a rule, conflicts should be fixed in the branch before merging back to trunk.