Fix: Reset before pulling in changes

Author: localheinz

build.xml

@@ -7,6 +7,11 @@
         <echo message="Choose your task, please - use 'vendor/bin/phing -l' to see a list of available tasks" />
     </target>
 
+    <target hidden="true" name="git-reset">
+        <echo message="Clean up" />
+        <exec logoutput="true" checkreturn="true" command="ssh ${ssh.user}@${ssh.host} -p ${ssh.port} 'cd ${project.root}; git reset --hard HEAD'" />
+    </target>
+
     <target hidden="true" name="git-pull">
         <echo message="Pull changes from origin" />
         <exec logoutput="true" checkreturn="true" command="ssh ${ssh.user}@${ssh.host} -p ${ssh.port} 'cd ${project.root}; git pull origin master ${tag}'" />
@@ -22,7 +27,7 @@
         <exec logoutput="true" checkreturn="true" command="ssh ${ssh.user}@${ssh.host} -p ${ssh.port} 'chown -R www-data:www-data ${project.root}/data'" />
     </target>
 
-    <target name="deploy" description="Deploys application to production" depends="git-pull, composer-install, owner-change">
+    <target name="deploy" description="Deploys application to production" depends="git-reset, git-pull, composer-install, owner-change">
         <echo message="Successfully deployed to production" />
     </target>
 </project>