There should likely be multiple scenarios - including failed merge due to conflicts. And ideally the conflicts would also semantically conflict so it would show the need to think and not merge blindly.
Another challenge should show that dependencies won't necessarily show up during merge (i.e merge will go OK, but testsuite will fail).
There should likely be multiple scenarios - including failed merge due to conflicts. And ideally the conflicts would also semantically conflict so it would show the need to think and not merge blindly.
Another challenge should show that dependencies won't necessarily show up during merge (i.e merge will go OK, but testsuite will fail).