Merge branch 'develop' into jtg/repeater

JesseTG · web-flow · commit 36d2f7c8e401 · 2019-06-10T19:09:15.000-04:00
diff --git a/publish-nightly.sh b/publish-nightly.sh
@@ -6,8 +6,10 @@ setup_git() {
 }
 
 update_nightly_branch() {
+    printf "Run nightly update \n"
     git remote add origin-nightly https://${GH_TOKEN}@github.com/ashblue/fluid-behavior-tree.git
-    git subtree push --prefix Assets/FluidBehaviorTree origin-nightly nightly
+    git subtree split --prefix Assets/FluidBehaviorTree -b nightly
+    git push -f origin-nightly nightly:nightly
 }
 
 setup_git

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,10 @@ setup_git() {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`update_nightly_branch() {`
	`9`	`+ printf "Run nightly update \n"`
`9`	`10`	`git remote add origin-nightly https://${GH_TOKEN}@github.com/ashblue/fluid-behavior-tree.git`
`10`		`- git subtree push --prefix Assets/FluidBehaviorTree origin-nightly nightly`
	`11`	`+ git subtree split --prefix Assets/FluidBehaviorTree -b nightly`
	`12`	`+ git push -f origin-nightly nightly:nightly`
`11`	`13`	`}`
`12`	`14`
`13`	`15`	`setup_git`