Stack Overflow
Stack Overflow

Questions tagged [branching-strategy]

153 questions
2
votes
1 answer

How can I merge finished work patch instead of its whole history into test branch?

A developer starts work on a feature lets call it "Fix a hardcoded link", once it's done, it's passed to another developer for peer review. Peer reviewer is ok with code changes and merge feature branch into test branch. "Fix a hardcoded link" is…
filype
  • 8,034
  • 10
  • 40
  • 66
2
votes
2 answers

Choosing A Branching Strategy To Fit Our Deployment Needs

Background So, I've spent the better portion of the last month automating our web + db deployment using MSDeploy, SSDT and TeamCity. The only problem is that, for demonstration purposes, I've only worked from our trunk branch. Needless to say, this…
TMcManemy
  • 814
  • 9
  • 20
2
votes
2 answers

Development and testing branch in @nvie's Git branching model?

I've read about @nvie's Git branching model and gitflow and I think this is a good model to use for a project (web application) I'm currently working on. I'm the lead developer of the project and I develop on a local environment (MAMP-like).…
Jonathan
  • 6,572
  • 1
  • 30
  • 46
2
votes
2 answers

Git - transferring all commits to another branch and creating a new master

(There's a lot of similar questions on this, and I've also read through various docs, but I can't find anything answering this specific issue.) Given a repository with no remotes and no branches, with 20 commits on master. The intent is to end up…
Peter Boughton
  • 110,170
  • 32
  • 120
  • 176
1
vote
1 answer

TFS 2010 branching model for an in-house application

This is not a question where I don't have any ideas, but instead I would like to present a model and see if it gets approved or anyone can see issues with it or has better suggestions. They say it's better to carefully choose you branching model in…
Iulian Ilies
  • 265
  • 2
  • 19
1
vote
1 answer

Branching strategy for parallel task-based development

We have three environments or website (dev, staging and production) on which runs a version of our ASP.NET application. We use SVN and continuous integration (Teamcity) to help automatically deploy the application to each web server. Our current…
Jason
  • 4,557
  • 5
  • 31
  • 40
1
vote
1 answer

How can I keep a solved git conflict in a different branch?

Our team's branching strategy is a mix between git-flow and trunk-based. A feature is developed in a branch, then deployed to a staging environment for approval, then merged into master and deployed to production. Lately a problem has been brought…
Elías D
  • 11
  • 4
1
vote
1 answer

Git branching strategy for Agile methodology

We are working using Agile methodoly and we need to deploy our code into three environments (DEV / UAT / PROD). Only Features validated in UAT can go in production at the end of a sprint. To do so, we are currently using 3 branches: master (which…
Orkhidion
  • 11
  • 1
1
vote
0 answers

gitlab flow with release branches

with gitlab flow with release branching strategy, this is what my understanding is, you have one main branch which is long lived protected branch developers branch out feature branches from main and merges back in to main on every pull request…
Gaurang Shah
  • 11,764
  • 9
  • 74
  • 137
1
vote
0 answers

How do I manage PR and CI pipelines in Git Flow strategy?

If I deploy to prod from the latest release branch forked from dev how can I integrate PR to review code? Also, if I would like to run a test integration pipeline automatically when a pull request is done to link the result to the pull request and…
Mazza
  • 37
  • 6
1
vote
1 answer

Multiple Initial Branches in Azure DevOps Repositories

I was wondering if it is possible to make Azure DevOps to automatically create both master and develop branches upon creating a new repository. I want both branches protected. If project level branch policies are set up for both, but only master is…
Gabor Laszlo
  • 11
  • 4
1
vote
0 answers

Block a git branch from committing to a specified branch

I'm fairly new to GitHub. I wanted to confirm if there is a layer configuration in GitHub where we can restrict which branch can commit to what. Here's the situation: Only Develop branch can commit to QA/Test branch Only Test branch can commit to…
Katherine Darunday
  • 11
  • 2
1
vote
1 answer

Suggestions for moving from Gitflow to Trunk-based dev

We currently support two branching strategies; gitflow and trunk-based dev. My company started using what I'd call a hybrid (read not correctly IMO) gitflow model, but the direction of the company is to move to trunk-based development. I like the…
sleon
  • 173
  • 1
  • 13
1
vote
3 answers

Best way to remove commits from a release branch

So far I'm using the Git Workflow. I've seen a lot of documentation about it using the "Ideal happy world" solution, but not realistic scenarios. Git Workflows is very straightforward: create a release branch from Develop and merge into master. But…
Erick P
  • 21
  • 2
1
vote
0 answers

Trunk-Based Deployment: How do you avoid Feature Flag Clutter?

For developers that use Trunk-based development, how have you approached dealing with an ever-growing collection of feature flags in your codebase? My concern is if you are heavily leveraging feature flags for every release and every new feature,…
Glen Cooney
  • 107
  • 5
1 2 3
…
10 11