From 67bf0a1334e97c16623991820f8e4174a48c1545 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Mon, 11 Aug 2014 16:11:00 -0700 Subject: [PATCH] Gruntfile.coffee: fix merge error --- Gruntfile.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gruntfile.coffee b/Gruntfile.coffee index 51ad15234..6dbcf3803 100755 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -131,7 +131,7 @@ module.exports = (grunt) -> command: """ git tag -af beta -m "<%= pkg.meta.name %> v<%= pkg.meta.version %>." git checkout gh-pages - git checkout beta 'builds/*<%= pkg.meta.suffix.beta %>.*' + git checkout beta "builds/*<%= pkg.meta.suffix.beta %>.*" git commit -am "Move <%= pkg.meta.name %> v<%= pkg.meta.version %> to beta channel." git checkout - """.split('\n').join('&&') @@ -140,7 +140,7 @@ module.exports = (grunt) -> git tag -af stable -m "<%= pkg.meta.name %> v<%= pkg.meta.version %>." git checkout -b tmp git merge --no-commit -s ours gh-pages - git checkout gh-pages 'builds/*<%= pkg.meta.suffix.beta %>.*' + git checkout gh-pages "builds/*<%= pkg.meta.suffix.beta %>.*" git commit -am "Move <%= pkg.meta.name %> v<%= pkg.meta.version %> to stable channel." git checkout gh-pages git merge --ff-only tmp