remove force for merge

hut6 · Oct 29, 2022 · 78f3e31 · 78f3e31
1 parent a7c1f06
commit 78f3e31
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tag-release b/tag-release
@@ -32,8 +32,8 @@ if($rebase) {
 } else {
     exec('git pull --ff-only', $output, $return);
 }
-if(!$force && $return !== 0) {
-    die("Failed merging origin. Use '--force' if you like chaos.");
+if($return !== 0) {
+    die("Failed merging origin. Probably requires manual fix.");
 }
 
 $versionFile = 'VERSION';