From 4b883d5e57f4e2bf7dc7a144879cf343c7b7cf59 Mon Sep 17 00:00:00 2001
From: Thomas Benz <tbenz@iis.ee.ethz.ch>
Date: Mon, 26 Feb 2024 13:16:53 +0100
Subject: [PATCH] Change strategy

---
 util/deploy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/deploy.py b/util/deploy.py
index ddc797b1..dbd76c79 100644
--- a/util/deploy.py
+++ b/util/deploy.py
@@ -20,7 +20,7 @@
 GIT_CHECKOUT_CMD = 'git checkout'
 GIT_CHECKOUT_TAG_CMD = 'git checkout -b'
 GIT_COMMIT_CMD = 'git commit -m'
-GIT_MERGE_SQUASH_CMD = 'git merge --squash -s ours'
+GIT_MERGE_SQUASH_CMD = 'git merge --squash'
 GIT_PUSH_CMD = 'git push'
 
 # Repo configuration