From 20110ea142e56b44a9b42529fd38154c8ae21562 Mon Sep 17 00:00:00 2001
From: Jim Procter <jprocter@issues.jalview.org>
Date: Sun, 8 Jul 2018 12:55:07 +0100
Subject: [PATCH] JAL-3033 hard reset to clean eclipse workspace before
 checking out

---
 build.xml |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 4ff78e0..b7f1af3 100755
--- a/build.xml
+++ b/build.xml
@@ -1028,7 +1028,11 @@
   </exec>
   <!-- update and checkout the same commit in the workspace project -->
   <exec executable="/usr/bin/git" failifexecutionfails="true" dir="${eclipse-workrepo}">
-    <arg value="pull" />
+    <arg value="reset" />
+    <arg value="--hard" />
+  </exec>
+  <exec executable="/usr/bin/git" failifexecutionfails="true" dir="${eclipse-workrepo}">
+      <arg value="pull" />
   </exec>
   <exec executable="/usr/bin/git" failifexecutionfails="true" dir="${eclipse-workrepo}">
     <arg value="checkout" />
-- 
1.7.10.2