Force reset FETCH_HEAD when fetching branch

1 files changed, 4 insertions, 3 deletions

diff --git a/Rakefile b/Rakefile
index 7b9fd9ab..f3a7eadd 100644
--- a/Rakefile
+++ b/Rakefile
@@ -75,9 +75,10 @@ task :pull_repos do
       # Enter the temporary directory and return after block is completed.
       FileUtils.cd(temp_dir) do
         # Update repository from master. Fetch and reset to avoid
-        # merge conflicts
-        `git fetch origin #{branch}`
-        `git reset --hard #{branch}`
+        # merge conflicts.
+        # Why: https://gitlab.com/gitlab-com/gitlab-docs/merge_requests/119
+        # How: https://stackoverflow.com/a/9589927/974710
+        `git fetch origin #{branch} && git reset --hard FETCH_HEAD && git clean -df`
       end
     else
       puts "This shouldn't happen"