Skip to content

Commit a06f35a

Browse files
committed
Remove merge feature branch to develop
1 parent 8cd41ee commit a06f35a

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

.travis.yml

-6
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ jobs:
1414
- bash bin/deploy/install_python_dependencies.sh
1515
script:
1616
- sudo bash bin/tests/run_tests_on_travis.sh
17-
- stage: merge (feature branch --> develop)
18-
install: skip
19-
script:
20-
- sudo bash bin/deploy/merge_feature_branch_to_develop.sh
2117
- stage: merge (develop --> master)
2218
install: skip
2319
script:
@@ -41,8 +37,6 @@ jobs:
4137
stages:
4238
- name: test
4339
if: NOT(branch==master)
44-
- name: merge (feature branch --> develop)
45-
if: (NOT (branch IN (develop,master))) AND (NOT(type==pull_request))
4640
- name: merge (develop --> master)
4741
if: branch==develop AND (NOT(type==pull_request))
4842
- name: deploy

0 commit comments

Comments
 (0)