Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>In a VCS, having just a "master" branch shows quickly its limits because you cannot pursue all the development effort at the same time on one branch.<br> That means you need to know <strong><a href="https://stackoverflow.com/questions/2100829#2107672">when to branch</a></strong>.</p> <p>But in a DVCS (as in "Decentralized" VCS), you also have a <strong><a href="https://stackoverflow.com/questions/1039817/git-commit-frequency/1040502#1040502">publication issue</a></strong>, with branches you keep local to your repositories, and branches you are pushing to or pulling from.</p> <p>In this context, start by identifying your concurrent development effort, and decide on a publication (push/pull) process. For instance (and this is not the only way):</p> <ul> <li>prod is a read-only public branch with the code in production. Everyone could pull from it in order to: <ul> <li>rebase its current development on top of it (for local testing, or for integrating on the local dev repo a hotfix done in the prod repo on the prod branch)</li> <li>branch to do new features (from a known stable code)</li> <li>branch to start the next release branch (the one which is to be in production)<br> no one should push directly to prod (hence the read-only)</li> </ul></li> <li>release is a read-write consolidation branch, where the relevant commits are cherry-picked to be part of the next release.<br> Everyone can push to release to update the next release.<br> Everyone can pull from said release in order to update his/her local consolidation process.</li> <li>featureX is a private read-write branch (in that it does not need to be push to the central prod repo), and can be pushed/pulled between dev repos. It represents middle to long term effort, different from the daily dev</li> <li>master represents the current dev, and is pushed/pulled between the dev repos.</li> </ul> <p>Other release management processes exist, as this <a href="https://stackoverflow.com/questions/1042400/git-releases-management/1042463#1042463">SO question attests</a>.</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. 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.
    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