diff --git a/src/SolutionProviders/MergeConflictSolutionProvider.php b/src/SolutionProviders/MergeConflictSolutionProvider.php index bec89e78..d667d433 100644 --- a/src/SolutionProviders/MergeConflictSolutionProvider.php +++ b/src/SolutionProviders/MergeConflictSolutionProvider.php @@ -60,7 +60,7 @@ protected function getCurrentBranch(string $directory): string protected function hasMergeConflictExceptionMessage(Throwable $throwable): bool { - // For PHP 7.x and bellow + // For PHP 7.x and below if (Str::startsWith($throwable->getMessage(), 'syntax error, unexpected \'<<\'')) { return true; }