Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>You might benefit from the workflow Scott Chacon describes in <a href="http://git-scm.com/book" rel="noreferrer">Pro Git</a>. In this workflow, you have two branches that always exist, <em>master</em> and <em>develop</em>.</p> <p><em>master</em> represents the most stable version of your project and you only ever deploy to production from this branch.</p> <p><em>develop</em> contains changes that are in progress and may not necessarily be ready for production.</p> <p>From the <em>develop</em> branch, you create topic branches to work on individual features and fixes. Once your feature/fix is ready to go, you merge it into <em>develop</em>, at which point you can test how it interacts with other topic branches that your coworkers have merged in. Once <em>develop</em> is in a stable state, merge it into <em>master</em>. It should always be safe to deploy to production from <em>master</em>.</p> <p>Scott describes these long-running branches as "silos" of code, where code in a less stable branch will eventually "graduate" to one considered more stable after testing and general approval by your team.</p> <p>Step by step, your workflow under this model might look like this:</p> <ol> <li>You need to fix a bug.</li> <li>Create a branch called <em>myfix</em> that is based on the <em>develop</em> branch.</li> <li>Work on the bug in this topic branch until it is fixed.</li> <li>Merge <em>myfix</em> into <em>develop</em>. Run tests.</li> <li>You discover your fix conflicts with another topic branch <em>hisfix</em> that your coworker merged into <em>develop</em> while you were working on your fix.</li> <li>Make more changes in the <em>myfix</em> branch to deal with these conflicts.</li> <li>Merge <em>myfix</em> into <em>develop</em> and run tests again.</li> <li>Everything works fine. Merge <em>develop</em> into <em>master</em>.</li> <li>Deploy to production from <em>master</em> any time, because you know it's stable.</li> </ol> <p>For more details on this workflow, check out the <a href="http://git-scm.com/book/en/Git-Branching-Branching-Workflows" rel="noreferrer">Branching Workflows</a> chapter in Pro Git.</p>
    singulars
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. This table or related slice is empty.
    2. VO
      singulars
      1. This table or related slice is empty.
    3. VO
      singulars
      1. This table or related slice is empty.
 

Querying!

 
Guidance

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload