From 80fe41009a463fd171eec6992ee0d9f28fb917ba Mon Sep 17 00:00:00 2001 From: Relintai Date: Thu, 18 Jun 2020 11:35:05 +0200 Subject: [PATCH] Now the setup script will pull the right branch when updating the engine, this should fix git leaving lots of merge conflicts. --- SConstruct | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index 05b7343a..47d96bfa 100644 --- a/SConstruct +++ b/SConstruct @@ -155,7 +155,9 @@ def setup_repository(data, clone_path, branch = 'master'): subprocess.call('git reset --hard', shell=True) subprocess.call('git clean -f -d', shell=True) subprocess.call('git checkout -B ' + branch + ' origin/' + branch, shell=True) - subprocess.call('git pull origin master', shell=True) + subprocess.call('git pull origin ' + branch, shell=True) + subprocess.call('git reset', shell=True) + subprocess.call('git reset --hard', shell=True) if data[1] in target_commits: target = target_commits[data[1]][branch]