Skip to content

Remove merge feature branch to develop #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 11, 2021
Merged

Remove merge feature branch to develop #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/deploy/merge_develop_to_master.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [ "$TRAVIS_BRANCH" == "develop" ]; then
git fetch
git reset --hard
git checkout master || echo "Git checkout master failed"
git merge "$TRAVIS_COMMIT" || echo "Merge develop to master failed"
git merge --ff-only "$TRAVIS_COMMIT" || echo "Merge develop to master failed"
git push -q https://$GITHUB_TOKEN@github.com/ggeop/Python-ai-assistant master
fi

12 changes: 0 additions & 12 deletions bin/deploy/merge_feature_branch_to_develop.sh
View file
Open in desktop

This file was deleted.