Stack Overflow
Stack Overflow

Questions tagged [branching-strategy]

153 questions
5
votes
1 answer

What is a good branching strategy when developing several future releases at once?

The past I develop a software project using subversion as an scm. Until now, development always happened in trunk, so problems arose when a bugfix release was necessary. Now, we want to rethink our branching strategy and the requirement is: We want…
David
  • 3,787
  • 2
  • 29
  • 43
5
votes
2 answers

Git merge strategy for Agile Branching workflow

We're adopting a new branching policy to work with Agile and to enable us to release on a feature by feature basis, whereby we have a master branch and a QA branch as perpetual branches. Nightly builds will be based on QA and releases will come from…
Andrew Trevers
  • 1,246
  • 8
  • 10
5
votes
3 answers

Git branching strategy for a newly lean team

We have a web app for which we have a couple of corporate customers. We have recently decided to offer it as a SaaS app and to follow the lean approach (in parallel with our corporate offering). Which means we've got experiments on the go that might…
Markus Coetzee
  • 3,384
  • 1
  • 29
  • 26
4
votes
2 answers

How to use branches with multiple projects and Teamcity

I'm looking for a best practice for the following situation: I have one bll/dal project, and tree UI projects that uses the bll/dal project. In the beginning we putted it all in one trunk folder on a SVN-repository. We are using userbranches, so…
bruno
  • 1,830
  • 2
  • 22
  • 36
4
votes
1 answer

TFS Branching or Moving Under Source Item

I have a Team Foundation Server 2013 code structure like follows... $/TeamProject/Application/AllTheCodeFiles ...but I'd like to refactor to have... $/TeamProject/Application/Trunk/AllTheCodeFiles Which will allow me to implement a branching and…
Pattrick King
  • 1,172
  • 8
  • 13
4
votes
2 answers

Coder collaboration best practices using Git

I'm having some troubles in understanding Git team-working principles. Consider a team of two programmers: A and B. They are working on a Project. Also, there is a remote server with a repo on it. A and B are collaborating remotely. There are some…
Darmen Amanbay
  • 4,869
  • 3
  • 29
  • 50
3
votes
0 answers

When should tag git a release in Gitlab flow before release or after the release?

We are using Gitlab and Gitlab flow as our branching strategy. We are having master, production and a bunch of feature branches. Our master branch is managing the staging environment and when master is merged with production, something can be…
Ali
  • 1,759
  • 2
  • 32
  • 69
3
votes
1 answer

Looking to incorporate changes from sub-branch into branch but both contain same commits

Definitely a neophyte when it comes to git, hence what probably is a pretty bone-headed question to follow here: I have a master branch that I started working on an enhancement in. Twenty-something or so commits in I realized I should have made a…
lukederienzo
  • 105
  • 1
  • 10
3
votes
0 answers

GitHub Multiple Teams Branching Model for a Repository

We have the below branching model in GitHub for our applications to release them in multiple environments. Overall Branching Strategy Points to be considered - In our organization multiple teams work on single repository with different release…
Jai
  • 75
  • 5
3
votes
2 answers

How to configure GitVersion for Release Flow?

I am trying to configure GitVersion to work with the Release Flow branching strategy. Basically, I have a mainline Master branch, Release, Feature and Fix branches. The Feature and Fix branches are created from the Master branch and merged back…
Marius Stănescu
  • 3,603
  • 2
  • 35
  • 49
3
votes
1 answer

How to merge a git branch to multiple release branches

After a tfs migration (totally different concept of branches) I have to merge fixes to multiple release branches, but the branches are not identical, they are mostly similar, but different products(eg different branding, conn strings etc. ), so i…
MrKekson
  • 720
  • 6
  • 18
3
votes
1 answer

When to increment versions in git branching model

Currently using http://nvie.com/posts/a-successful-git-branching-model/ which has been working out quite well. One point that I'm not really clear on is how to handle fixes that are done while a release branch is created. If it was a regular…
diplosaurus
  • 2,538
  • 5
  • 25
  • 53
3
votes
1 answer

SVN - Is creating branch from branch from branch on and on wrong?

Situation: I have seen a practice where SVN branches are created from branches and keep on going. For example: Branch1 was created from TRUNK; Branch2 from Branch1; etc. See below to get an idea: ....goes on and on.......Branch4--from-->…
sivv
  • 31
  • 2
2
votes
0 answers

flutter repository branching convention

In flutter repository. there are some branches containing candidate for example: flutter-2.7-candidate.1. could someone please explain what are these branches for? and what is the logic behind naming them?
reza
  • 1,354
  • 1
  • 7
  • 25
2
votes
1 answer

Branching strategy for ADF

We are facing challenges with ADF deployment with multiple teams working on same ADF for different use cases. When we move from Dev to Test to Prod we find difficult to deploy the code. Teams working on their on working branches (feature) This will…
Jithesh K
  • 21
  • 1
1
2
3
…
10 11