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