Tagged Questions
15
votes
6answers
530 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 ...
11
votes
2answers
390 views
A decent git branching model for products that should accompany the version of another, third-party product (and pros and cons of one proposal)
Note: My question is focused in my specific problem (which involves Liferay) but I hope it can be useful for anyone who needs to maintain various versions of a same project on git.
I work on a ...
5
votes
3answers
455 views
Source Control: Roles and Responsibilities - Best Practices
I'm looking for "Best Practices" concerning roles and responsibilities, specifically who is responsible for merges from development branches to trunk (or main). Basically I'm looking for ammunition to ...
3
votes
5answers
321 views
Choosing the right branching strategy for releases
Starting with a new dev team on a new project and we have to define our Branching strategy for our source repository (e.g. Microsoft Team Foundation Server 2010). We've run into a sticky discussion ...
2
votes
3answers
158 views
SVN: Working with branches using the same working copy
We've just moved to SVN from CVS. We have a small team and everyone checks in code on the trunk and we have never ever used branches for development.
We each have directories on a remote dev server ...
16
votes
4answers
570 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 ...
12
votes
6answers
504 views
How do you avoid working on the wrong branch?
Being only a little careful is usually enough, but sometimes I need to double check the branch I'm working on (e.g "hm..i'm on dev branch, right?") and I check the source control path of a random ...
5
votes
4answers
268 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 ...
1
vote
1answer
91 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 ...
5
votes
1answer
520 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 ...
4
votes
3answers
268 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 ...
2
votes
1answer
238 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 ...
5
votes
6answers
320 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 ...
