From 827b337bbb77b84ce4b8cd2d01f8c7a183ad15d1 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Mon, 4 Sep 2017 21:07:46 +0200
Subject: Fetch and reset rather than pull to avoid merge conflicts

---
 Rakefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'Rakefile')

diff --git a/Rakefile b/Rakefile
index 119a24ca..9465f52b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -74,8 +74,10 @@ task :pull_repos do
 
       # Enter the temporary directory and return after block is completed.
       FileUtils.cd(temp_dir) do
-        # Update repository from master.
-        `git pull origin #{branch}`
+        # Update repository from master. Fetch and reset to avoid
+        # merge conflicts
+        `git fetch origin #{branch}`
+        `git reset --hard origin/#{branch}`
       end
     else
       puts "This shouldn't happen"
-- 
cgit v1.2.3