replace pull with a hard checkout
parent
b98f3b6a6b
commit
219ec7f88e
|
|
@ -60,7 +60,7 @@ setInterval(function update() {
|
||||||
logp('attempting to fetch new version');
|
logp('attempting to fetch new version');
|
||||||
|
|
||||||
appendLogs('fetch', execSync(`git fetch`));
|
appendLogs('fetch', execSync(`git fetch`));
|
||||||
appendLogs('pull', execSync(`git pull`));
|
appendLogs('checkout', execSync(`git checkout --force --theirs ${branch}`));
|
||||||
appendLogs('yarn', execSync(`yarn`));
|
appendLogs('yarn', execSync(`yarn`));
|
||||||
|
|
||||||
logp('restarting...')
|
logp('restarting...')
|
||||||
|
|
|
||||||
Reference in New Issue