add git reset --hard HEAD to git command in quickedit_git_reload

djangoapps/courseware/views.py

@@ -437,7 +437,7 @@ def quickedit_git_reload(request):
         
     if 'gitupdate' in request.POST:
         import os			# FIXME - put at top?
-        cmd = "cd ../data%s; git pull origin %s" % (xp,xp.replace('/',''))
+        cmd = "cd ../data%s; git reset --hard HEAD; git pull origin %s" % (xp,xp.replace('/',''))
         msg += '<p>cmd: %s</p>' % cmd
         ret = os.popen(cmd).read()
         msg += '<p><pre>%s</pre></p>' % ret.replace('<','&lt;')