wip: OpSec

brickbox-io · Sep 30, 2021 · d05e02d · d05e02d
1 parent fcbf6f7
commit d05e02d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -85,7 +85,7 @@ jobs:
         git pull
 
         git checkout release
-        git merge --no-squash master-ci --strategy-option theirs --ff-only
+        git merge --no-squash master-ci --strategy-option theirs
 
         sed -i -e 's/DEBUG = True/DEBUG = False/g' brickbox/settings.py