Update makerelease
This commit is contained in:
parent
02bf7d889b
commit
74dd453964
1 changed files with 2 additions and 0 deletions
|
@ -47,6 +47,7 @@ git commit -a -m "New Release : $version"
|
|||
if [ ! "$branch" = "master" ]; then
|
||||
echo "Merge branch $branch to master..."
|
||||
git checkout master
|
||||
git pull
|
||||
git merge $branch
|
||||
|
||||
read -p "Delete branch $branch ? (y/N)" choice
|
||||
|
@ -98,5 +99,6 @@ rm -R .build
|
|||
|
||||
if [ ! "$branch" = "master" ]; then
|
||||
git checkout $branch
|
||||
git merge master
|
||||
git push
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue