Aggiornato Composer

2024-05-17 12:24:19 +00:00
parent 4ac62108b5
commit ec201d75b2
2238 changed files with 38684 additions and 59785 deletions
--- a/vendor/facade/ignition/src/SolutionProviders/MergeConflictSolutionProvider.php
+++ b/vendor/facade/ignition/src/SolutionProviders/MergeConflictSolutionProvider.php
@@ -49,7 +49,7 @@ class MergeConflictSolutionProvider implements HasSolutionsForThrowable

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

        if ($branch === "''") {
            $branch = 'current branch';