From 210caea7f0c4e53f828c3755635d00530b73b8f7 Mon Sep 17 00:00:00 2001 From: Gary Katsevman Date: Tue, 10 Nov 2015 15:50:21 -0500 Subject: [PATCH] @gkatsev updated contrib.json to use / as branch-name separator in feature-accept. closes #2803 --- CHANGELOG.md | 1 + contrib.json | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8829d3470..4d870256a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ CHANGELOG * @incompl fixed broken link to reduced test cases article ([view](https://github.com/videojs/video.js/pull/2801)) * @zjruan updated text track prototype loops to blacklist constructor for IE8 ([view](https://github.com/videojs/video.js/pull/2565)) * @gkatsev fixed usage of textTracksToJson ([view](https://github.com/videojs/video.js/pull/2797)) +* @gkatsev updated contrib.json to use / as branch-name separator in feature-accept ([view](https://github.com/videojs/video.js/pull/2803)) -------------------- diff --git a/contrib.json b/contrib.json index 0fe4238e0..c6e9c6761 100644 --- a/contrib.json +++ b/contrib.json @@ -408,10 +408,10 @@ [ "git commit -a --author='{{prCommits.[0].commit.author.name}} <{{prCommits.[0].commit.author.email}}>' -m '{{line}}. closes #{{prNum}}'", "Commit the changes" ], { "prompt": "confirm", "desc": "Does everything look ok?" }, [ "git checkout {{pr.base.ref}}", "Check out the base branch" ], - [ "git merge {{pr.user.login}}-{{pr.head.ref}}", "Merge the changes" ], + [ "git merge {{pr.user.login}}/{{pr.head.ref}}", "Merge the changes" ], [ "git push origin {{pr.base.ref}}", "Push the changes to your remote copy of the project" ], [ "git push upstream {{pr.base.ref}}", "Push the changes to the main project" ], - [ "git branch -D {{pr.user.login}}-{{pr.head.ref}}", "Delete the local branch used for merging" ] + [ "git branch -D {{pr.user.login}}/{{pr.head.ref}}", "Delete the local branch used for merging" ] ] } }