Skip to content

brainfood / videojs-contrib-hls

Go to a project
Toggle navigation
Toggle navigation pinning
310d41f1 by David LaPalomento
Options

Quote the merge commit message 

accept-as-is was failing because the merge commit message was unquoted.
1 parent 9ea83820
Inline Side-by-side
Showing 1 changed file with 1 additions and 1 deletions
...@@ -345,7 +345,7 @@ ...@@ -345,7 +345,7 @@
345 [ "git pull --rebase {{pr.head.repo.ssh_url}} {{pr.head.ref}}", "Merge and rebase the changes"], 345 [ "git pull --rebase {{pr.head.repo.ssh_url}} {{pr.head.ref}}", "Merge and rebase the changes"],
346 [ "git checkout {{pr.base.ref}}", "Check out the base branch" ], 346 [ "git checkout {{pr.base.ref}}", "Check out the base branch" ],
347 { "prompt": "text", "id": "line", "desc": "Describe this change in one line" }, 347 { "prompt": "text", "id": "line", "desc": "Describe this change in one line" },
348 [ "git merge --no-ff {{pr.user.login}}-{{pr.head.ref}} -m {{line}}. Closes #{{prNum}}", "Merge the changes" ], 348 [ "git merge --no-ff {{pr.user.login}}-{{pr.head.ref}} -m '{{line}}. Closes #{{prNum}}'", "Merge the changes" ],
349 [ "grunt chg-add:'{{line}} ([view](https\\://github.com/{{meta.org}}/{{meta.name}}/pull/{{prNum}}))'", "Add a line to the changelog" ], 349 [ "grunt chg-add:'{{line}} ([view](https\\://github.com/{{meta.org}}/{{meta.name}}/pull/{{prNum}}))'", "Add a line to the changelog" ],
350 [ "git add CHANGELOG.md", "Add the changlelog change to be committed" ], 350 [ "git add CHANGELOG.md", "Add the changlelog change to be committed" ],
351 [ "git commit --amend --no-edit", "Add the changelog change to the merge commit" ], 351 [ "git commit --amend --no-edit", "Add the changelog change to the merge commit" ],
......