http://www.klayge.org/wiki/index.php?action=history&feed=atom&title=%E8%B4%A1%E7%8C%AE%E4%BB%A3%E7%A0%81%E7%9A%84%E5%B7%A5%E4%BD%9C%E6%B5%81 2026-10-17T11:55:25Z Revision history for this page on the wiki MediaWiki 1.22.1 http://www.klayge.org/wiki/index.php?title=%E8%B4%A1%E7%8C%AE%E4%BB%A3%E7%A0%81%E7%9A%84%E5%B7%A5%E4%BD%9C%E6%B5%81&diff=2267&oldid=prev 2015-07-01T06:35:34Z

<p></p> <table class='diff diff-contentalign-left'> <col class='diff-marker' /> <col class='diff-content' /> <col class='diff-marker' /> <col class='diff-content' /> <tr style='vertical-align: top;'> <td colspan='2' style="background-color: white; color:black; text-align: center;">← Older revision</td> <td colspan='2' style="background-color: white; color:black; text-align: center;">Revision as of 06:35, 1 July 2015</td> </tr><tr><td colspan="2" class="diff-lineno">Line 1:</td> <td colspan="2" class="diff-lineno">Line 1:</td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>== 指导原则 ==</div></td><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>== 指导原则 ==</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td></tr> <tr><td class='diff-marker'>−</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div># '''在独立的分支工作''。每一个新功能或bug修正，再提交补丁或者pull <del class="diffchange diffchange-inline">request前都需要建立一个分支。</del></div></td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div># '''在独立的分支工作<ins class="diffchange diffchange-inline">'</ins>''。每一个新功能或bug修正，再提交补丁或者pull <ins class="diffchange diffchange-inline">request前都需要建立一个分支。任何直接到master或develop的提交都会被拒绝。</ins></div></td></tr> <tr><td class='diff-marker'>−</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div># '''<del class="diffchange diffchange-inline">总是基于最新的master分支</del>'''。用“git pull --<del class="diffchange diffchange-inline">rebase”把你的修改移到master的顶端。</del></div></td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins class="diffchange diffchange-inline"># '''分支遵循一定的命名规则'''。分支应该命名为feature/YOUR_FEATURE_NAME或bugfix/YOUR_BUG_NAME。</ins></div></td></tr> <tr><td colspan="2">&#160;</td><td class='diff-marker'>+</td><td style="color:black; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div># '''<ins class="diffchange diffchange-inline">总是基于最新的develop分支</ins>'''。用“git pull --<ins class="diffchange diffchange-inline">rebase”把你的修改移到develop的顶端。</ins></div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div># '''合并提交'''。建议把每个新功能或bug修正合并成一个修改后提交。（git reset --soft &quot;HEAD^&quot;，git commit --amend）</div></td><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div># '''合并提交'''。建议把每个新功能或bug修正合并成一个修改后提交。（git reset --soft &quot;HEAD^&quot;，git commit --amend）</div></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"></td></tr> <tr><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>[[en:Workflow of contributing code]]</div></td><td class='diff-marker'>&#160;</td><td style="background-color: #f9f9f9; color: #333333; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;"><div>[[en:Workflow of contributing code]]</div></td></tr> </table>

Gongminmin http://www.klayge.org/wiki/index.php?title=%E8%B4%A1%E7%8C%AE%E4%BB%A3%E7%A0%81%E7%9A%84%E5%B7%A5%E4%BD%9C%E6%B5%81&diff=2175&oldid=prev 2015-03-25T01:40:15Z

<p>Created page with &quot;== 指导原则 == # &#039;&#039;&#039;在独立的分支工作&#039;&#039;。每一个新功能或bug修正，再提交补丁或者pull request前都需要建立一个分支。 # &#039;&#039;&#039;总是基于最...&quot;</p> <p><b>New page</b></p><div>== 指导原则 ==<br /> <br /> # '''在独立的分支工作''。每一个新功能或bug修正，再提交补丁或者pull request前都需要建立一个分支。<br /> # '''总是基于最新的master分支'''。用“git pull --rebase”把你的修改移到master的顶端。<br /> # '''合并提交'''。建议把每个新功能或bug修正合并成一个修改后提交。（git reset --soft &quot;HEAD^&quot;，git commit --amend）<br /> <br /> [[en:Workflow of contributing code]]</div>

Gongminmin