Merge pull request ggeop#102 from ggeop/test_branch

Remove merge feature branch to develop

Author: ggeop

.travis.yml

@@ -47,9 +47,9 @@ stages:
  - name: test
  if: branch!=master AND branch!=^untagged.*
  - name: merge (develop --> master)
- if: branch==develop AND type!=pull_request
+ if: branch=develop AND type!=pull_request
  - name: deploy
- if: branch==master AND type!=pull_request
+ if: branch=master
 
 notifications:
  email: false

bin/deploy/merge_develop_to_master.sh

@@ -7,7 +7,7 @@ if [ "$TRAVIS_BRANCH" == "develop" ]; then
  git fetch
  git reset --hard
  git checkout master || echo "Git checkout master failed"
- git merge --ff-only "$TRAVIS_COMMIT" || echo "Merge develop to master failed"
+ git merge "$TRAVIS_COMMIT" || echo "Merge develop to master failed"
  git push -q https://$GITHUB_TOKEN@github.com/ggeop/Python-ai-assistant master
 fi