Merge pull request #316 from brickbox-io/justin

chore: Fixed the ci merge
brickbox-io · Mar 7, 2022 · ec69800 · ec69800
2 parents 6945156 + c6ff184
commit ec69800
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -111,7 +111,7 @@ jobs:
 
           git checkout master-ci
 
-          git pull
+          git pull -X theirs origin master-ci
 
           git checkout release