Skip to content
saberma edited this page Sep 26, 2011 · 2 revisions

如何参与

贡献者

您可以:

  1. Fork ShopQi
  2. 加入功能或者提交Bug
  3. 编写相应的测试用例
  4. 发送pull request

项目成员

解决commit冲突

如果github的forkqueue显示"Will likely not apply cleanly",则需要手动合并分支

git remote add shopqi git://github.com/saberma/shopqi.git
git pull shopqi master
# 手动修正文件冲突...
git commit -a -m 'merge from shopqi'
git push origin master
Clone this wiki locally