Fix flaky test in parallel mode The test was non deterministic in parallel mode. However fixing that made something else strange surface, which required some changes in the test setup that I cannot explain.
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