From bb3963a2889221eca10903ebf50a90b0ca3033b9 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 4 May 2017 10:36:40 +0000
Subject: [PATCH] #1343 @0.25

---
 inc/ws/Controlleur/class.ws.maintenance.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 646f150f4..a33014150 100644
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -869,7 +869,7 @@ class wsMaintenance {
 		$localDir = $playerDir . 'local/';
 		$git = new CubeIT_CommandLine_Git($branchesDir . 'fluidbook-html5');
 		echo '<pre>';
-		echo $git->executeCmd('fetch --all');
+		echo $git->executeCmd('pull --all');
 		$git = new CubeIT_CommandLine_Git($branchesDir . 'fluidbook-html5');
 		$b = $git->executeCmd('branch -r');
 		echo $b;
@@ -901,7 +901,10 @@ class wsMaintenance {
 			}
 			$git = new CubeIT_CommandLine_Git($branchesDir . $b);
 			echo $git->executeCmd('reset --hard origin/' . $b);
+			$git = new CubeIT_CommandLine_Git($branchesDir . $b);
+			echo $git->executeCmd('pull');
 		}
+
 		echo '</pre>';
 		file_put_contents(WS_CACHE . '/activebranches', json_encode($branches));
 	}
-- 
2.39.5