Branching, in revision control is the duplication of an object under revision control so that modifications can happen in parallel along both branches.

learn more… | top users | synonyms

1
vote
1answer
119 views

Would this be the equivalent of creating a branch, while working with a detached head in Git?

Let's say I checked out a version different than HEAD. Let's say I made some commits, and so an anonymous branch was created. Afterwards I may have checked out a different branch, so now the only way ...
6
votes
1answer
2k views

Mercurial branch or rebase?

After using mercurial daily for over a year, we are about to find a better workflow for our DVCS. Inspired by a successful Git branching model we are about to move away from our "push daily work into ...
5
votes
3answers
458 views

Forgetting to merge changes from trunk to branch

Recently, I forgot to merge changes from trunk to our maintenance branch. This caused us to rebuild - twice - and put QA on hold for two days while we fixed the mess. Normally, when committing to ...
3
votes
4answers
1k views

Subversion Tools To Help With Branching and Merging [closed]

Our shop is about to release a major rewrite of our application. And, we are going to need to do bug fixes on versions out in the field while developing new features for the next version. Frankly, ...
3
votes
5answers
2k views

TFS - web sites based under IIS - how to handle branching

I'm just looking for some advice/best practice for this situation: We have a solution with a couple of web sites in it (one is a web site project, the other is a web application project). We have ...
0
votes
2answers
132 views

Storing bugfixes as local changes rather than in SVN branch

We are deploying and upkeeping web-sites to different customers. Normally we wait for newest changes to stabilize, then tag subversion version as release, and install than version to customer. Then we ...
2
votes
1answer
705 views

What's the best version control/QA workflow for a legacy system?

I am struggling to find a good balance with our development and testing process. We use Git right now, and I am convinced that ReinH's Git Workflow For Agile Teams is not just great for capital-A ...
6
votes
6answers
571 views

What's the best way to explain branching (of source code) to a client?

The situation is that a client requested a number of changes about 9 months ago which they then put on hold with them half done. They've now requested more changes without having made up their mind ...