Clone
Cédric Champeau
committed
on 08 Jun 18
Consistently report conflict resolution
This commit refactors how conflict resolution selection reasons are handled, in order to:

- collect… Show more
Consistently report conflict resolution

This commit refactors how conflict resolution selection reasons are handled, in order to:

- collect the list of versions which participated in conflict resolution

- report a single conflict resolution cause when conflicts are resolved several times for the same module

- consistently report module replacement rules as rules, not conflict resolution. Before this change,

a module replacement was reported as both a conflict and a rule

Show less

master + 379 more