Linked Questions
27 questions linked to/from To branch or not to branch?
12
votes
7
answers
3k
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 branches. ...
- 11.1k
6
votes
6
answers
940
views
Git branches avoided by the office where I work [duplicate]
The place I work at does the following:
They manage a dev version of an app
They manage another replicate version of that app, they call this the rep
version
The live version of the app that is ...
- 79
1
vote
1
answer
4k
views
Developer Branch vs. Feature Branch [duplicate]
I saw around that development teams usually use source control in one of 2 schemes:
Either "Feature Branch", where each feature is developed in a new branch, or "Developer Branch", where each ...
- 119
4
votes
2
answers
2k
views
Understanding branching strategy/workflow correctly [duplicate]
I'm using svn without branches (trunk-only) for a very long time at my workplace. I had discovered most or all of the issues related to projects which do not have any branching strategy. Unlikely this ...
- 215
2
votes
1
answer
3k
views
Develop in trunk and then branch off, or in release branch and then merge back? [duplicate]
Say that we've decided on following a "release-based" branching strategy, so we'll have a branch for each release, and we can add maintenance updates as sub-branches from those.
Does it matter ...
1
vote
3
answers
714
views
Is it a newbie mistake to avoid branching? [duplicate]
My team is new to versioning and we're trying to keep things simple, as to not overwhelm ourselves with tools-headaches. Also, our product can't be compiled and run locally, so our work is actually ...
1
vote
4
answers
374
views
Web API Development and SVN [duplicate]
We are planning to develop a ASP.NET Web API project starting soon. For source control we use svn. We typically follow the pattern of the trunk being stable and doing all of our work in the branches....
- 95
0
votes
1
answer
163
views
PHP and Subversion workflow [duplicate]
I'm working on a project in a small team at the moment working on a webapp. We originally had 3 on the team with a lead dev and now we've grown to 7 and a lead dev.
At the moment our workflow is this:...
- 153
142
votes
6
answers
85k
views
The trend of the "develop" branch going away
I've noticed something lately looking at some popular projects on GitHub, that there's no develop branch. And in fact, the GitHub Flow guide doesn't mention it either. From my understanding, master ...
- 1,561
54
votes
7
answers
4k
views
Is there something wrong with how we're doing version control?
I work with a team of programmers as the business analyst. We just released version 2.0 of our product and are working on the next version to be released in 3 months (it's an internal software ...
- 1,095
34
votes
12
answers
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 ...
- 443
46
votes
6
answers
59k
views
What is the difference between development and R&D?
I was asked by a colleague to explain clearly the difference between ordinary development and research and development (R&D) and was unable to do it. After reading Wikipedia, I still don't have ...
- 135k
28
votes
10
answers
8k
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 ...
- 639
24
votes
4
answers
33k
views
How to use github, branches and automatic releases for version management? [closed]
I understand most of the basic Git/Github concepts by now, however I still have trouble understanding the bigger picture.
These are some things that I have managed to get working so far:
Push ...
- 1,138
17
votes
3
answers
4k
views
Introducing a version control branching policy to a small team
I'm a contractor that has recently started with a firm.
Team is 3 developers consisting of 2 junior to mid level devs, with another at the same level starting soon, and myself (6 Years xp). For both ...
- 513
9
votes
8
answers
1k
views
How can I properly manage commits, prevent feature conflicts, and manage dependencies with a VCS?
It’s become an annoying factor of working with large teams: how do you manage checkins and prevent feature conflicts and manage dependencies with source control properly?
Currently at my workplace ...
- 1,430
10
votes
7
answers
790
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 ...
- 5,255
11
votes
5
answers
4k
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 ...
- 221
6
votes
2
answers
855
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 ...
- 199
2
votes
4
answers
9k
views
Branch per feature: What are the actual benefits (and risks)? [closed]
I've read quite a lot of posts lately about different branching strategies (e.g a lot of links from To branch or not to branch?), and while almost every article explains on how to do this or that ...
- 169
7
votes
2
answers
2k
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 ...
- 1,481
1
vote
2
answers
3k
views
Git - single or multiple branch
I am working on this project of mine where I am the only developer. I have chosen git for the version control for the project. Currently, I work from multiple systems and commit to the master branch ...
- 121
5
votes
2
answers
4k
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 ...
- 829
1
vote
2
answers
1k
views
How can I avoid editing conflicts repeatedly when merging from one to branch to another?
I have an SVN repository set up like so:
trunk
branches
UAT
QA
DevelopmentTeam
programmer1
projectA
projectB
programmer2
projectC
projectD
programmer3
projectE
projectF
projectG
projectH
Each ...
- 199
0
votes
3
answers
777
views
Version Control Workflow (Subversion)
I've been learning how to use subversion and would just like someone to clarify whether or not my understanding is correct?
Create a master repository at a given location (be it on a webserver or ...
- 3,556
0
votes
1
answer
1k
views
What are branching strategy pros and cons for 2 main types
So at a high level, we have multiple projects/solutions in company and we need to keep them in 1 source control.
Since the number of projects is around 50, we are not creating individual repositories ...
- 41
0
votes
2
answers
369
views
The two-storey branching scheme **before** the develop branch
I have found many posts about how to organize work on develop branch and up to release branch. Or even how to work without the develop branch.
The trend of the "develop" branch going away, ...
- 2,805