From c3f6995a35daf1cbfc211175cd1384b864916df7 Mon Sep 17 00:00:00 2001
From: Justin Merrell <merrelljustin@gmail.com>
Date: Thu, 30 Sep 2021 14:15:11 +0000
Subject: [PATCH] wip: OpSec

---
 .github/workflows/ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fa322c5..e5c5aad 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -83,11 +83,12 @@ jobs:
 
         git checkout master-ci
         git pull
-        git rebase origin/release
 
         git checkout release
         git merge --no-squash master-ci --strategy-option theirs
 
+        git rebase origin/release
+
         sed -i -e 's/DEBUG = True/DEBUG = False/g' brickbox/settings.py
 
         git add .