[Python-checkins] peps: Another update to 103

barry.warsaw python-checkins at python.org
Tue Sep 15 14:33:41 CEST 2015


https://hg.python.org/peps/rev/7442df41c689
changeset:   6063:7442df41c689
user:        Barry Warsaw <barry at python.org>
date:        Tue Sep 15 08:33:38 2015 -0400
summary:
  Another update to 103

files:
  pep-0103.txt |  27 +++++++++++++++++++++++++++
  1 files changed, 27 insertions(+), 0 deletions(-)


diff --git a/pep-0103.txt b/pep-0103.txt
--- a/pep-0103.txt
+++ b/pep-0103.txt
@@ -628,6 +628,33 @@
     $ git merge -s ours v1  # null-merge v1 into master
 
 
+Branching models
+================
+
+Git doesn't assume any particular development model regarding
+branching and merging. Some projects prefer to graduate patches from
+the oldest branch to the newest, some prefer to cherry-pick commits
+backwards, some use squashing (combining a number of commits into
+one). Anything is possible.
+
+There are a few examples to start with. `git help workflows
+<https://www.kernel.org/pub/software/scm/git/docs/gitworkflows.html>`_
+describes how the very git authors develop git.
+
+ProGit book has a few chapters devoted to branch management in
+different projects: `Git Branching - Branching Workflows
+<https://git-scm.com/book/en/Git-Branching-Branching-Workflows>`_ and
+`Distributed Git - Contributing to a Project
+<https://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project>`_.
+
+There is also a well-known article `A successful Git branching model
+<http://nvie.com/posts/a-successful-git-branching-model/>`_ by Vincent
+Driessen. It recommends a set of very detailed rules on creating and
+managing mainline, topic and bugfix branches. To support the model the
+author implemented `git flow <https://github.com/nvie/gitflow>`_
+extension.
+
+
 Advanced configuration
 ======================
 

-- 
Repository URL: https://hg.python.org/peps


More information about the Python-checkins mailing list