(hopefully) fix release process

chewiebug · chewiebug · commit 50f2f17b2313 · 2019-11-30T22:49:44.000+01:00
diff --git a/cicd/gcviewer-script.sh b/cicd/gcviewer-script.sh
@@ -37,7 +37,7 @@ function merge_with_develop_branch() {
   # since travis did a shallow clone (git clone --depth=50 ...), we need to fetch the develop branch first
   git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
   git fetch --depth=10
-  git checkout -t -b develop origin/develop
+  git checkout develop
   git merge ${TRAVIS_BRANCH}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ function merge_with_develop_branch() {`
`37`	`37`	`# since travis did a shallow clone (git clone --depth=50 ...), we need to fetch the develop branch first`
`38`	`38`	`git config remote.origin.fetch "+refs/heads/:refs/remotes/origin/"`
`39`	`39`	`git fetch --depth=10`
`40`		`- git checkout -t -b develop origin/develop`
	`40`	`+ git checkout develop`
`41`	`41`	`git merge ${TRAVIS_BRANCH}`
`42`	`42`	`}`
`43`	`43`