贡献代码的工作流

From KlayGE
Revision as of 21:40, 24 March 2015 by Gongminmin (Talk | contribs)

(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)
Jump to: navigation, search

指导原则

  1. '在独立的分支工作。每一个新功能或bug修正,再提交补丁或者pull request前都需要建立一个分支。
  2. 总是基于最新的master分支。用“git pull --rebase”把你的修改移到master的顶端。
  3. 合并提交。建议把每个新功能或bug修正合并成一个修改后提交。(git reset --soft "HEAD^",git commit --amend)