Completed
Pull Request — master (#58)
by James
01:24
created
src/SolutionProviders/MergeConflictSolutionProvider.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -46,6 +46,9 @@
 block discarded – undo
46 46
         ];
47 47
     }
48 48
 
49
+    /**
50
+     * @param string $folder
51
+     */
49 52
     private function getCurrentBranch($folder)
50 53
     {
51 54
         $branch = "'" . trim(`cd $folder; git branch | grep \* | cut -d ' ' -f2`) . "'";
Please login to merge, or discard this patch.