1
0
mirror of https://github.com/videojs/video.js.git synced 2025-01-04 06:48:49 +02:00

Added merge to master process back to the patch accept process

This commit is contained in:
heff 2015-10-09 14:13:23 -07:00
parent 8c101e2b35
commit 0832b89970

View File

@ -148,7 +148,10 @@
"desc": "Merge a submitted patch",
"steps": [
{ "include": "update {{meta.branches.release}}" },
{ "include": "pull_request accept" }
{ "include": "pull_request accept" },
[ "git checkout master", "Checkout the developmet branch" ],
[ "git merge stable", "Merge the patch changes" ],
[ "git push upstream master", "Push the development changes" ]
]
}
},