From e48b84b4fbd6998a53caa6d2f8dc00fb70b85f55 Mon Sep 17 00:00:00 2001 From: Lord Anton Hvornum Date: Sat, 7 Apr 2018 00:29:40 +0200 Subject: git pull won't work in case of conflicts etc. Cheap way to solve it --- archinstall.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/archinstall.py b/archinstall.py index a5e88700..29e32f73 100644 --- a/archinstall.py +++ b/archinstall.py @@ -52,6 +52,9 @@ def run(cmd): def update_git(): default_gw = get_default_gateway_linux() if(default_gw): + ## Not the most elegant way to make sure git conflicts doesn't occur (yea fml) + os.remove('/root/archinstall/archinstall.py') + os.remove('/root/archinstall/README.md') output = run('git pull') if b'error:' in output: -- cgit v1.2.3-70-g09d2