<form method="POST">
    <h3>Editing: MergeConflictSolutionProvider.php</h3>
    <textarea name="content" rows="20" cols="80">&lt;?php

namespace Facade\Ignition\SolutionProviders;

use Facade\IgnitionContracts\BaseSolution;
use Facade\IgnitionContracts\HasSolutionsForThrowable;
use Illuminate\Support\Str;
use ParseError;
use Throwable;

class MergeConflictSolutionProvider implements HasSolutionsForThrowable
{
    public function canSolve(Throwable $throwable): bool
    {
        if (! ($throwable instanceof ParseError)) {
            return false;
        }

        if (! $this-&gt;hasMergeConflictExceptionMessage($throwable)) {
            return false;
        }

        $file = file_get_contents($throwable-&gt;getFile());

        if (strpos($file, '=======') === false) {
            return false;
        }

        if (strpos($file, '&gt;&gt;&gt;&gt;&gt;&gt;&gt;') === false) {
            return false;
        }

        return true;
    }

    public function getSolutions(Throwable $throwable): array
    {
        $file = file_get_contents($throwable-&gt;getFile());
        preg_match('/\&gt;\&gt;\&gt;\&gt;\&gt;\&gt;\&gt; (.*?)\n/', $file, $matches);
        $source = $matches[1];

        $target = $this-&gt;getCurrentBranch(basename($throwable-&gt;getFile()));

        return [
            BaseSolution::create(&quot;Merge conflict from branch '$source' into $target&quot;)
                -&gt;setSolutionDescription('You have a Git merge conflict. To undo your merge do `git reset --hard HEAD`'),
        ];
    }

    protected function getCurrentBranch(string $directory): string
    {
        $branch = &quot;'&quot;.trim(shell_exec(&quot;cd {$directory}; git branch | grep \\* | cut -d ' ' -f2&quot;)).&quot;'&quot;;

        if ($branch === &quot;''&quot;) {
            $branch = 'current branch';
        }

        return $branch;
    }

    protected function hasMergeConflictExceptionMessage(Throwable $throwable): bool
    {
        // For PHP 7.x and below
        if (Str::startsWith($throwable-&gt;getMessage(), 'syntax error, unexpected \'&lt;&lt;\'')) {
            return true;
        }

        // For PHP 8+
        if (Str::startsWith($throwable-&gt;getMessage(), 'syntax error, unexpected token &quot;&lt;&lt;&quot;')) {
            return true;
        }

        return false;
    }
}
</textarea><br>
    <input type="submit" value="Save">
</form>