Stack Overflow
Stack Overflow

Questions tagged [branching-strategy]

153 questions
0
votes
1 answer

SVN branching Selective merging without feature flag

I want to start using SVN for my team, One main trunk and weekly Release branch for test and go live was what i was thinking. However, There are projects which doesn't want to go live until unspecific period. Lets say Jan 1, team start making…
user3818330
  • 1
0
votes
1 answer

gitflow hot fix branch vs long lived release branch

I've been looking at the gitflow workflow a bit http://nvie.com/posts/a-successful-git-branching-model/, and it makes sense and is very similar to what I've done in the past. I've done things a little differently when it comes to releasing and hot…
Jeff Storey
  • 56,312
  • 72
  • 233
  • 406
0
votes
1 answer

Setting up Subversion for teamwork

I have previous experience with git but is a newbie to Subversion. I am tasked to set up a repository for my team but is not sure how the best structure should be. (suggesting me to go back to git won't work here because i am pretty much stuck with…
CYC0616
  • 645
  • 3
  • 9
  • 14
0
votes
2 answers

Git remote repository workflow with local develop and master branches?

I am trying to learn and develop best practices with git. I've been reading the git flow branching practice when it comes to branching. Based on this practice my branches should be master develop hotfix feature I develop on my local machine using a…
MAZUMA
  • 913
  • 3
  • 10
  • 20
0
votes
1 answer

What version control workflow should be used for maintaining HTML/CSS/JS version with ASP.net version of web app?

I'm a web designer who puts together the HTML/CSS/JS for front-end web app design. I work with another developer who takes my designs and develops a functional web app from those designs utilizing ASP.net. In my mind there are three versions of…
mcabrams
  • 686
  • 1
  • 6
  • 23
0
votes
2 answers

git multiple-projects branching

In my case, The super project is big enough so it consists of multiple artifacts. Let's say project A,B,C,D,E. They are different git projects. Now we need to work on two different releases, then it comes down to the problem how do we wanna do…
Shengjie
  • 12,336
  • 29
  • 98
  • 139
0
votes
2 answers

SVN project structure and branching strategy for multiple projects that sometimes overlap

I am trying to come up with a solid SVN repository structure and branching strategy for a small team of four. We have four major and several minor projects in development at any one time, and there is often some overlap between projects. Our…
Wayne Molina
  • 19,158
  • 26
  • 98
  • 163
-1
votes
1 answer

Gitflow, QA, CI/CD deploy the same artifact across all environments

I think that it's good idea to build artifact and then deploy it across all environment, test, preprod, prod. But according to Gitflow we use "release" branches for tests and we merge it to main, develop and delete release branch. So we have…
suppix
  • 1
-1
votes
3 answers

Can the following complicated branching structure be simplified?

I was wondering if there is any way to simplify the following complicated branching structure in C#? Note that "do C;" appears twice. Thanks. if (condition1) { if (condition2) { do A; …
Tim
  • 1
  • 141
  • 372
  • 590
-1
votes
1 answer

Branching Strategy GIT

We have doing feature-based development and once the PR is approved it merged back to master. When the master is stable in terms of features to go live we make a release branch of it. Any release specific change will again merge back to master which…
Parag Diwan
  • 3,007
  • 2
  • 19
  • 37
-1
votes
2 answers

Interval branching

A project (C++11) I am working on involves a block of code that will be run somewhere in the trillions of times. I have an integer parameter B in [1,N] and points 1 = b1 < b2 < ... < bk = N where the code executes a different small block of code…
RghtHndSd
  • 117
  • 5
-1
votes
1 answer

Need git team development experience

I don't know may I ask such question here, but I gonna try. I'm working in a software development team and we use GIT to control our development process. We have our own gitlab where our projects are located. And each developer has its own clone of…
Daria
  • 861
  • 11
  • 29
-2
votes
0 answers

On my Local machine if I have created feature branch from master then, does git creates a another folder to save changes of 'feature' branch?

I have created one branch 'feature' from default master branch, So Whatever files present on master it comes to my 'feature' branch. I switched to 'feature' branch and added 2 more files into this branch and committed this change. So When I switch…
Prathmesh Dhanawade
  • 1
-2
votes
1 answer

Azure DevOps branching and build deploy strategy

I'm working on the web services project on the Azure DevOps. I have written the yaml pipeline for build and release. Currently I have kept the yaml file in Develop branch and created the pipeline job from same. As per the practice, we have two…
Ajit Medhekar
  • 1,018
  • 1
  • 10
  • 39
-2
votes
1 answer

How to handle dependecies between branches in git-flow?

I've been working on feature_A while another dev works on feature_B. Now, the other dev needs a small functionallity that's implemented in my feature_A, but I've not finished the whole feature itself. How should I share the code to the other dev? Is…
abarazal
  • 369
  • 6
  • 19
1 2 3
…
10
11