version-control
< git
< tips
< performance
< google
< knowledge-markets
< collective-intelligence 2
< alexko
Get flash to fully experience Pearltrees
Let’s go through a simple example of branching and merging with a workflow that you might use in the real world. You’ll follow these steps: Do work on a web site. Create a branch for a new story you’re working on. Do some work in that branch. At this stage, you’ll receive a call that another issue is critical and you need a hotfix.
Traditional version control helps you backup, track and synchronize files. Distributed version control makes it easy to share changes. Done right, you can get the best of both worlds: simple merging and centralized releases. Distributed? What’s wrong with regular version control?
Mercurial is a fast, easy to use, distributed revision control tool for software developers. Getting started Documentation and help Getting support
Copyright © 1999, 2000 Karl Fogel <kfogel@red-bean.com> This document is free software; you can redistribute and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. This document is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
Background: Our usage model and reasons for switching Each developer had their own code copy of the repository. We used an "alphasite" for internal quality reviews, a "betasite" for client work reviews, and a production copy for the live website. We weren't trying to maintain branches in CVS. I was aware they are one of the hassles of using CVS . If we wanted to share code with each other, or update the alphasite, the betasite or or the production site, we would commit to CVS HEAD and update the desired location.