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

19
votes
4answers
2k views

What is the best way to handle product versioning and branching of long term projects?

In a general sense, for long term projects that may have multiple releases during the products life cycle and require support of previous products, what is the best way to handle product versions and ...
22
votes
10answers
3k views

How do you avoid working on the wrong branch?

Being careful is usually enough to prevent problems, but sometimes I need to double check the branch I'm working on (e.g. "hmm... I'm in the dev branch, right?") by checking the source control path of ...
12
votes
4answers
2k views

How do you put different versions of your library under version control? Do you use tags? Or branches? Or another method?

I have recently started putting my code under version control (in the lab I'm working, under SVN, and my own codes in github (obviously with git)). Before using version control, I used to do something ...
4
votes
3answers
238 views

Getting started with repositories: are they what I need, or are there any alternatives?

I'm a solo iOS developer - mostly self taught, but have made several successful apps so far and potentially starting some slightly bigger projects. What I want to do: As I'm working on some bigger ...
48
votes
12answers
10k views

To branch or not to branch?

Till recently my development workflow was the following: Get the feature from product owner Make a branch (if feature is more than 1 day) Implement it in a branch Merge changes from main branch to ...
6
votes
3answers
3k views

When should development branches be created?

We are moving our project's team from using a single Main/Trunk branch, to multiple Development/Work branches that should be regularly merged into Main. We're basing our new process on this article ...
1
vote
1answer
46 views

Branching an application setup/installer across versions?

I am wondering whether I should branch our installer script/project-file (we use InnoSetup) with each application release or whether I should keep one in installer script that generates the setup for ...
9
votes
2answers
1k views

Should you bother with SVN branches if you only ever have one?

If we only work with one branch in Subversion, should we even bother? Can't we just work on the trunk to speed things up? This is how we develop with Subversion: There is a trunk We make a new ...
4
votes
6answers
731 views

How to set up for selective pushing with Mercurial?

I have a situation, when I'm working on a project, but at same time small issues arise which require quick fix. I would like to push just the fixes for these problems to the main repo while keeping ...
1
vote
1answer
126 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
467 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 ...
4
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
141 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
790 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
584 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 ...