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

12
votes
3answers
663 views

How to refactor when all your development is on branches?

At my company, all of our development (bug fixes and new features) is done on separate branches. When it's complete, we send it off to QA who tests it on that branch, and when they give us the green ...
19
votes
3answers
2k views

Strategy for code review before merge to master from feature branches

Me and my team use feature branches (with git). I'm wondering which is the best strategy for code review before merge to master. I checkout a new branch from master, lets call it fb_#1 I commit a ...
7
votes
6answers
986 views

Branching Strategy for Test Environment

We will be starting a new project this month. The project will be 1 year and production deployment will only occur towards the end of the project. We will be doing iterative development (1 month per ...
6
votes
5answers
2k views

What's the most effective way to share code between .NET applications?

In our work, we have several different .net applications that share a lot of base functionality. We've built these applications using a clean n-tier architecture, but we've hit that moment where we ...
12
votes
4answers
4k views

Why do git commits not contain the name of the branch they were created on?

When working with git in a team using feature branches, I often find it difficult to understand the branch structure in history. Example: Let's say there was a feature branch feature/make-coffee, ...
0
votes
2answers
227 views

Git temporary code-change

My program interacts with another application via a socket communication. The current public version of this application does not support a specific command while the newest trunk does. To be ...
28
votes
11answers
2k views

Is it ever OK to commit non-working code?

Is it good idea to require to commit only working code? This commit doesn't need to leave the repository in a working state as: ... we are in early design stages, the code is not yet stable. ...
3
votes
1answer
1k views

TFS Branching Advice

I am new to Branching and Merging but I have been tasked with making future development on an application possible while still allowing bug fixes to production. Usually I am the only developer on the ...
3
votes
1answer
290 views

Continuous integration and modifying existing UI automation tests

Our team is currently facing a situation where we are changing a feature that is in the product today. This feature has Selenium automation tests associated with it. We are performing a fairly major ...
0
votes
2answers
2k views

When should we clean up old, no longer used GIT branches? [duplicate]

We have several bugfix branches that are starting to pile up. They have been merged into master, and deployed to production. Is there a good benchmark for when these branches should be cleaned up? ...
10
votes
3answers
250 views

Which is better for small bug fixes and small features - naming branches by ticket number or naming them by feature description?

I am in the middle of a disagreement (cordial, of course) with my lead about proper branch naming. This applies to bug-fix and small feature branches, not long-running feature branches. For ...
5
votes
3answers
2k views

Maintaining SVN history for a file when merge is done from the dev branch to trunk?

In my org, we use SVN for version control So for each build (done periodically), we merge the code to trunk from the development branch (all the developers checks in to this branch). So when we want ...
9
votes
4answers
313 views

When is it appropriate to start using the next revision of a tool when dogfooding?

Specifically, I am working on a tool that integrates a DVCS and build system, but I image the challenge I am facing would arise for anyone developing a "meta" tool (compiler, VCS, build system, test ...
22
votes
6answers
2k views

What does “branching is free” mean in Git?

What does "branching is free" mean in Git? I hear this a lot whenever Git is mentioned in comparison to other version control systems. I haven't had the opportunity (?) to deal with others (SVN, ...
3
votes
2answers
529 views

Branching strategy to avoid multiple release branches for different customers

I am currently thinking of the following branching strategy Main branch Development branch Feature branch Release branch Basically the whole idea is to have a release branch so that hot fix can ...
2
votes
1answer
280 views

What's a typical team size using a Git repo?

We've been using Git as our version control but as the team grows, there are more and more pains when it comes to getting all our changes onto a single branch ready for a deployment. I'm wondering ...
0
votes
1answer
438 views

Git Branch Model for iOS projects with one developer [duplicate]

I'm using git for an iOS project, and so far have the following branch model: feature_brach(usually multiple) -> development -> testing -> master Feature-branches are short-lived, just ...
7
votes
2answers
644 views

Feature branches, beta branches, and scrapped features

I've been thinking a lot about best practices regarding branching in distributed version control systems such as git an mercurial (the two dvcs's I have experience with and use on a daily basis). The ...
5
votes
3answers
2k views

Git: rebasing and keeping current to a remote branch - accepted practices?

When developing on a long-running branch (here defined as living longer than one release), what's the most accepted practice(s) to keeping the branch current with its origin while keeping the history ...
23
votes
7answers
1k views

how to stay efficient when a build is almost always broken

I work in a middle sized team which shares the same source code and while have a continues integration in place, but as all of us has to work in the same branch, the build is almost always broken. ...
0
votes
1answer
346 views

Beta-testing app good practice [duplicate]

I have just released an iOS app for beta-testing with TestFlight. I'm wondering what is good practice during beta-testing? Should I halt development of the app during beta-testing? Should I ...
5
votes
2answers
526 views

How to deal with undesired commits that break long-running release builds?

We ran into an unfortunate situation at work recently and I've been wondering what we can do to avoid similar problems in the future. We make embedded systems. The FPGA code is in one SVN repository ...
4
votes
1answer
603 views

Is git-flow in the spirit of git? [closed]

The question is pretty self-explanatory. I've had some experience with git-flow, and not much more true experience with plain git before that. (I was using it more as a backup-provider.) I'm ...
9
votes
5answers
436 views

Is it a good practice to have a remote branch for each developer?

Is it considered a good practice to have a remote branch for each individual developer in the project? We're using Git with the following branches: master release develop If each developer had ...
18
votes
2answers
5k views

Is a merging strategy like Git Flow really an anti-pattern?

My company is using Git, and is using a peculiar branching scheme - work is done in master, and branches are reserved for releases. This works fine, so long as all of the work done in an iteration ...
5
votes
4answers
488 views

Git: rebasing on top of a refactor that affects the target rebase branch

Let's say I have a feature (topic) branch that I keep rebased on top of my development branch. During the course of the project (before merging in my feature branch), I decide that I need to make a ...
8
votes
6answers
580 views

hginit - #ifdefs ridiculous

I was reading Joel Spolsky's mercurial introduction when it struck me: "And now what they do is this: each new feature is in a big #ifdef block. So they can work in one single trunk, while ...
4
votes
2answers
240 views

How to manage releases with multiple features at different states?

We have a branching structure of: multiple dev branches for each major new feature Main branch, merged into from a dev branch once a feature is ready for testing Release branch, merged into from ...
12
votes
7answers
1k views

Can branching ever be considered a bad practice? [duplicate]

Possible Duplicate: To branch or not to branch? A co-worker is against branching. I use branching all the time. I put the team onto a basic 3 branch system. I create my own feature ...
9
votes
3answers
1k views

Branching breaks continous integration?

I think this article, A Successful Git Branching Model, is very well known among experienced DVCS users. I use hg mostly, but I would argue this discussion is fine for any DVCS. Our current ...
6
votes
3answers
205 views

Advice: Developing two projects where one is an extension of the other

The Two Projects I work at a pretty small software company, and I'm currently in a situation where I'm at the end of development for "Project A", about to start development for "Project B". Project B ...
8
votes
7answers
493 views

How to keep the trunk stable when tests take a long time?

We have three sets of test suites: A "small" suite, taking only a couple of hours to run A "medium" suite that takes multiple hours, usually ran every night (nightly) A "large" suite that takes a ...
2
votes
3answers
238 views

GitHub OS project how to have a good version and a work in progress version

I have started my own OS application, I am hosting it on GitHub. My problem is that I push changes to the repository from more than one location so sometimes I want to work on it and sometimes I can't ...
8
votes
1answer
3k views

Useful git commit messages for merged branches

As a follow-up to this question: If I'm working on a team by myself, I can maintain useful commit messages when merging branches by squashing all the commits to a single diff and then merging that ...
1
vote
1answer
237 views

Git commit messages with nvie branching model

This Git branching model recommends branching for all development efforts and merging when complete: Branch Develop Merge when complete I'm wondering how this works in practice, given that ...
47
votes
2answers
28k views

Git branching and tagging best practices

I am currently learning to use Git by reading Pro Git. Right now I'm learning about branching and tags. My question is when should I use a branch and when should I use a tag? For example, say I ...
2
votes
3answers
1k views

Branching strategy for parallel development that won't be in the same release?

My team is working on a product, which for business reasons needs to be released on a regular schedule. An issue has arisen where we want to do development in parallel for the upcoming release, as ...
0
votes
1answer
125 views

How would you manage development between many Staging branches? [duplicate]

We have a Staging Branch. Then we came out with a Beta branch for users to move whenever they wanted to from old Production branch to the new features. Our plan seemed simple, we test on Staging, ...
1
vote
3answers
1k views

What does cheap copying/branching mean for a versioning system like SVN?

One of the advantages of SVN over CVS as given here is cheap copying and branching. What does "cheap copying and branching" mean in SVN parlance? How is it different from CVS copying and branching?
3
votes
2answers
362 views

Branching and CI Builds with Agile

We follow many agile processes, including automated tests, continuous integration, sprint reviews, etc... We're currently having a debate about how often we should branch release builds. We've been ...
23
votes
4answers
4k views

I am a git user confused by mercurial's branching. How am I supposed to track small changes?

I've always used git before, but I want to contribute to python so now I have to learn mercurial and I find it very frustrating. So, I've made a couple of small patches and I wanted to track them as ...
1
vote
3answers
150 views

TFS non-chronological deployment?

We have the following scenario: Changeset #1 is some unfinished buildable checkin Changeset #2 is a completed small task .. Changset #5 completes the work done at CS#1 They all affect the same ...
10
votes
3answers
747 views

Git: Fixing a bug affecting two branches

I'm basing my Git repo on A successful Git branching model and was wondering what happens if you have this situation: Say I'm developing on two feature branches A and B, and B requires code from A. ...
9
votes
3answers
398 views

dvcs - is “clone to branch” a common workflow?

I was recently discussing dvcs with a coworker, because our office is beginning to consider switching from TFS (we're a MS shop). In the process, I got very confused because he said that although he ...
7
votes
1answer
293 views

Git bug branching convention

I've been following the successful Git branching model guide for most of my development. I still wonder if the way I handle bug tickets is correct. My current workflow: Once I accept a bug ticket I ...
29
votes
10answers
2k views

Do DVCSes discourage continuous integration?

Say there is a team of ten agile developers. Every day they each pick a task from the board, commits several changes against it, until (by the end of the day) they have completed the task. All ...
5
votes
2answers
3k views

When to reintegrate feature branch?

From SVN 1.5, it supports reintegrate feature. I wonder when I should reintegrate. Should it be done before release or after release? If I do it Before release Pro: It is not forgettable to merge ...
1
vote
2answers
505 views

Importing an existing project into Git

Background During the course of developing our site (ASP.NET), we discovered that our existing source control (SourceGear Vault) wasn't working for us. So, we decided to migrate to Git. The ...
15
votes
6answers
907 views

How can I refactor a code base while others rapidly commit to it?

I'm on a private project that eventually will become open source. We have a few team members, talented enough with the technologies to build apps, but not dedicated developers who can write ...
0
votes
3answers
2k views

Deployment Tools that Integrate with TFS? [closed]

So I have this issue. The Operations team where I work has taken over TFS because they are using MS Build to build and deploy code to production servers. As a result developers have lost A LOT of ...