From e0def4ed79c27675e90e919f8926f0d10d3cb0f9 Mon Sep 17 00:00:00 2001
From: Rodrigo <rodrigosedano@me.com>
Date: Mon, 3 Jul 2023 17:33:36 +0200
Subject: [PATCH] 2.1.17

---
 release/app/package.json | 2 +-
 src/main/main.ts         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/release/app/package.json b/release/app/package.json
index 8e16cd01..6ec29440 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "EmuDeck",
-  "version": "2.1.16",
+  "version": "2.1.17",
   "description": "Play all your RetroGames",
   "license": "MIT",
   "author": {
diff --git a/src/main/main.ts b/src/main/main.ts
index caa24609..203bb2e9 100644
--- a/src/main/main.ts
+++ b/src/main/main.ts
@@ -597,7 +597,7 @@ ipcMain.on('pull', async (event, branch) => {
   let bashCommand = `cd ~/.config/EmuDeck/backend && git reset --hard && git clean -fd && git checkout ${branchGIT} && git pull && . ~/.config/EmuDeck/backend/functions/all.sh && appImageInit`;
 
   if (os.platform().includes('win32')) {
-    bashCommand = `cd %userprofile% && cd AppData && cd Roaming && cd EmuDeck && cd backend && git reset --hard && git clean -fd && git checkout ${branchGIT} && git pull && powershell -ExecutionPolicy Bypass -command "& { cd $env:USERPROFILE ; cd AppData ; cd Roaming  ; cd EmuDeck ; cd backend ; cd functions ; . ./all.ps1 ; appImageInit "}`;
+    bashCommand = `cd %userprofile% && cd AppData && cd Roaming && cd EmuDeck && cd backend && git reset --hard && git clean -fd && git checkout ${branchGIT} && git pull --allow-unrelated-histories -X theirs && powershell -ExecutionPolicy Bypass -command "& { cd $env:USERPROFILE ; cd AppData ; cd Roaming  ; cd EmuDeck ; cd backend ; cd functions ; . ./all.ps1 ; appImageInit "}`;
   }
   return exec(`${bashCommand}`, shellType, (error, stdout, stderr) => {
     logCommand(bashCommand, error, stdout, stderr);