Adjusted script

MyUNiDAYS · Nov 24, 2022 · 82fecc2 · 82fecc2
1 parent 8c6245d
commit 82fecc2
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/scripts/update-from-template.sh b/scripts/update-from-template.sh
@@ -21,10 +21,10 @@ git checkout --orphan our_template $COMMIT_LATEST_TAG
 git add *
 git commit -m "Updated with the template version $LATEST_TAG_FLASK_APP_TEMPLATE"
 
-# Force a merge w/ the 'dev' branch
-git checkout dev
-git merge our_template --allow-unrelated-histories -X theirs
+# Force a merge w/ the 'master' branch
+git checkout master
+git merge our_template --allow-unrelated-histories -X ours
 
-# Remove orphan branch & push 'dev' branch
+# Remove orphan branch & push 'master' branch
 git branch -D our_template
-git push origin dev
+git push origin master