Merge pull request #121 from afontainec/mergeDev

travis merge to dev after deploy
afontainec · May 25, 2020 · 225fc94 · 225fc94
2 parents e43933c + 31a522c
commit 225fc94
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/.travis/pu.sh b/.travis/pu.sh
@@ -37,6 +37,12 @@ upload_files() {
 
   # This pushes the new tag
   git push --tags
+
+  # merge to dev and push
+  git pull
+  git checkout dev
+  git merge master
+  git push origin dev
 }
 
 setup_git