Change strategy

pulp-platform · Feb 26, 2024 · 4b883d5 · 4b883d5
1 parent 96ab7c3
commit 4b883d5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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