Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

git push coffee-js gh-pages -f #8

Closed
tiye opened this issue Jan 29, 2014 · 0 comments
Closed

git push coffee-js gh-pages -f #8

tiye opened this issue Jan 29, 2014 · 0 comments

Comments

@tiye
Copy link
Member

tiye commented Jan 29, 2014

CoffeeScript 版本更新到 1.7.0, 文档合并出现问题,
检查发现官方仓库切换了方案, 我原先被合入仓库的代码被弃用.
汗,, 我没及时跟进主仓库的更新, 没早发现和参与讨论

新的方案在这里: jashkenas#3333
似乎 Eco 项目已经停止更新之类原因.. 已经换成了 Underscore 的 template.
我这边进行了一次 git rebase -i jashkenas/gh-pages, 并且强制推送到仓库..

已经 Fork 的同学需要手动调整一下仓库..
比如强制修改本地仓库执行 push -f 强制覆盖, 或者重新 Fork 仓库,
已有修改的同学需要进行 rebase.. 具体说不清...

我 rebase 的版本已经推到 http://coffee-script.org/
手动合并的位置不多, 似乎去掉了一些 run:inner 部分的代码...
粗略测试合并完成. 如果发现问题请提 Issue.
@tiye tiye closed this as completed Aug 1, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@tiye