PHP Class VersionPress\Tests\Utils\MergeAsserter

Mostra file Open project: versionpress/versionpress Class Usage Examples

Public Methods

Method Description
assertCleanMerge ( string $mergeCommand ) Asserts that a merge from $fromBranch ends with a clean merge (not a conflict)
assertMergeConflict ( string $mergeCommand ) Asserts that a merge from $fromBranch ends with a conflict

Method Details

assertCleanMerge() public static method

Asserts that a merge from $fromBranch ends with a clean merge (not a conflict)
public static assertCleanMerge ( string $mergeCommand )
$mergeCommand string Merge command to run and assert on

assertMergeConflict() public static method

Asserts that a merge from $fromBranch ends with a conflict
public static assertMergeConflict ( string $mergeCommand )
$mergeCommand string Merge command to run and assert on