<?xml version="1.0" encoding="utf-8"?>
<feed xml:lang="en-us" xmlns="http://www.w3.org/2005/Atom"><title>Simon Willison's Weblog: branching</title><link href="http://simonwillison.net/" rel="alternate"/><link href="http://simonwillison.net/tags/branching.atom" rel="self"/><id>http://simonwillison.net/</id><updated>2010-01-20T19:30:46+00:00</updated><author><name>Simon Willison</name></author><entry><title>A successful Git branching model</title><link href="https://simonwillison.net/2010/Jan/20/git/#atom-tag" rel="alternate"/><published>2010-01-20T19:30:46+00:00</published><updated>2010-01-20T19:30:46+00:00</updated><id>https://simonwillison.net/2010/Jan/20/git/#atom-tag</id><summary type="html">
    
&lt;p&gt;&lt;strong&gt;&lt;a href="http://nvie.com/archives/323"&gt;A successful Git branching model&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
This looks eminently sensible. The master branch is used for production-ready code, and is only updated by merging from either release branches or emergency hotfix branches. A develop branch is used for integration (from feature branches), and is branched to create release branches when a release is nearly ready. It’s all comprehensively documented and comes with some well-designed diagrams.

    &lt;p&gt;&lt;small&gt;&lt;/small&gt;Via &lt;a href="http://news.ycombinator.com/"&gt;Hacker News&lt;/a&gt;&lt;/small&gt;&lt;/p&gt;


    &lt;p&gt;Tags: &lt;a href="https://simonwillison.net/tags/branching"&gt;branching&lt;/a&gt;, &lt;a href="https://simonwillison.net/tags/development"&gt;development&lt;/a&gt;, &lt;a href="https://simonwillison.net/tags/git"&gt;git&lt;/a&gt;, &lt;a href="https://simonwillison.net/tags/process"&gt;process&lt;/a&gt;&lt;/p&gt;



</summary><category term="branching"/><category term="development"/><category term="git"/><category term="process"/></entry><entry><title>Subversion branching quick start</title><link href="https://simonwillison.net/2006/Oct/29/subversion/#atom-tag" rel="alternate"/><published>2006-10-29T15:27:29+00:00</published><updated>2006-10-29T15:27:29+00:00</updated><id>https://simonwillison.net/2006/Oct/29/subversion/#atom-tag</id><summary type="html">
    
&lt;p&gt;&lt;strong&gt;&lt;a href="http://www.nedbatchelder.com/text/quicksvnbranch.html"&gt;Subversion branching quick start&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
Ned Batchelder’s branching tutorial.


    &lt;p&gt;Tags: &lt;a href="https://simonwillison.net/tags/branching"&gt;branching&lt;/a&gt;, &lt;a href="https://simonwillison.net/tags/ned-batchelder"&gt;ned-batchelder&lt;/a&gt;, &lt;a href="https://simonwillison.net/tags/subversion"&gt;subversion&lt;/a&gt;&lt;/p&gt;



</summary><category term="branching"/><category term="ned-batchelder"/><category term="subversion"/></entry><entry><title>Subversion tips: working with branches</title><link href="https://simonwillison.net/2006/Feb/13/subversion/#atom-tag" rel="alternate"/><published>2006-02-13T15:20:25+00:00</published><updated>2006-02-13T15:20:25+00:00</updated><id>https://simonwillison.net/2006/Feb/13/subversion/#atom-tag</id><summary type="html">
    
&lt;p&gt;&lt;strong&gt;&lt;a href="http://www.dehora.net/journal/2006/02/subversion_tips_dealing_with_branches.html/"&gt;Subversion tips: working with branches&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
Django gets a mention for best practices.


    &lt;p&gt;Tags: &lt;a href="https://simonwillison.net/tags/branching"&gt;branching&lt;/a&gt;, &lt;a href="https://simonwillison.net/tags/django"&gt;django&lt;/a&gt;, &lt;a href="https://simonwillison.net/tags/subversion"&gt;subversion&lt;/a&gt;&lt;/p&gt;



</summary><category term="branching"/><category term="django"/><category term="subversion"/></entry></feed>