The tests should:

• Create an empty PR
• Call darc vmr resolve-conflicts
• Verify mergeability
• Push a new update into the PR
• Make a conflicting change in the PR
• Push a new update which will require another resolution
• Call darc vmr resolve-conflicts
• Verify mergeability

When creating the (conflicting) changes we should test these changes:

• Change a file two different ways
• Change a file on one side, remove on the other
• Add the same file with different contents
• Move files around