How does it handle conflicts during reverting? If another merge depends on a change, and that change causes a failing/broken test, does it revert both?