Permalink
Browse files

Merge branch used in bamboo plan into release instead of using always…

… develop
  • Loading branch information...
sburnicki committed Oct 2, 2018
1 parent 1cc724b commit 6c6d19b156f358ea3196b8a5fb8c0f06af73c517
@@ -1,8 +1,9 @@
#!/bin/bash
echo "prepare some variables"
echo "bamboo_planRepository_branchName=$bamboo_planRepository_branchName"
echo "########################################'"
echo "start bamboo job to merge develop into release"
echo "start bamboo job to merge $bamboo_planRepository_branchName into release"
echo "########################################'"
remote=origin
@@ -23,5 +24,5 @@ git tag -d $(git tag -l)
git fetch --all
echo "git checkout release"
git checkout release
echo "git merge develop"
git merge develop
echo "git merge $bamboo_planRepository_branchName"
git merge $bamboo_planRepository_branchName

0 comments on commit 6c6d19b

Please sign in to comment.