Message179853
| Author |
ezio.melotti |
| Recipients |
chris.jerdonek, eric.araujo, ezio.melotti, ncoghlan, pitrou, sandro.tosi, terry.reedy, tshepang |
| Date |
2013年01月13日.09:46:24 |
| SpamBayes Score |
-1.0 |
| Marked as misclassified |
Yes |
| Message-id |
<1358070384.97.0.264440993342.issue14468@psf.upfronthosting.co.za> |
| In-reply-to |
| Content |
I used FAQ-style titles to make easier to find the solution starting from a problem ("how do I do X?") and because I was planning to add more, but I can revert them to normal titles.
So that would result in 4 sections:
* Active branches (was "In what branches should I commit?");
* Merging order (was "In what order should I merge my commits?");
* Merging between different branches (within the same major version) (was "How do I merge between different branches (within the same major version)?");
* Porting changesets between the two major Python versions (2.x and 3.x) (was "How do I port a changeset between the two major Python versions (2.x and 3.x)?");
At the end of committing.rst I can add a link to the "committers faqs" in faqs.rst, and add more FAQs there. Everything about null merges, head merges, merge conflicts, long-term development branches etc. will go to faqs.rst. |
|