Метод | Описание | |
---|---|---|
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 |
public static assertCleanMerge ( string $mergeCommand ) | ||
$mergeCommand | string | Merge command to run and assert on |
public static assertMergeConflict ( string $mergeCommand ) | ||
$mergeCommand | string | Merge command to run and assert on |