Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gruntfile.coffee: fix merge error

Browse Source
This commit is contained in:
ccd0 2014-08-11 16:11:00 -07:00
parent e1d23a85ee
commit 67bf0a1334
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gruntfile.coffee
View File

@ -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