From 219ec7f88e0a297380ff45dc69854c7216c11a36 Mon Sep 17 00:00:00 2001
From: Marcus <marcus@valnet.xyz>
Date: Sun, 14 Feb 2021 03:18:15 -0500
Subject: [PATCH] replace pull with a hard checkout

---
 relay/service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/relay/service.js b/relay/service.js
index 34bce6e..4f25d6b 100644
--- a/relay/service.js
+++ b/relay/service.js
@@ -60,7 +60,7 @@ setInterval(function update() {
 		logp('attempting to fetch new version');
 
 		appendLogs('fetch', execSync(`git fetch`));
-		appendLogs('pull', execSync(`git pull`));
+		appendLogs('checkout', execSync(`git checkout --force --theirs ${branch}`));
 		appendLogs('yarn', execSync(`yarn`));
 
 		logp('restarting...')