Skip to main content
11 votes

How to get rid of develop branch for simplified Git flow

Let's say you take out the master branch (you can rename develop to master to confuse your team if you like later) and simply use tags for releases either on develop or hotfix branches. You took out ...
Jiri Klouda's user avatar
  • 5,807
11 votes

How to transition from a complex branching reality to a single-branch model?

Because you mention waterfall, I understand that the numerous branches you are alluding to are feature-branches rather than maintenance-branches. In this setup, I also assume that these branches are ...
Michaël Le Barbier's user avatar
11 votes
Accepted

What branching strategies/workflows are available for Git repositories?

The Atlassian website includes a comparison of different workflow strategies available when concerned with Git. More strategies exist, like the one used by Linux Kernel team, but are not relevant to ...
Evgeny Zislis's user avatar
8 votes
Accepted

How to get rid of develop branch for simplified Git flow

IMHO the problems you're facing are just a side effect of the poor branch strategy you started with: you're effectively plowing new development on develop (i.e. what converges towards the future ...
Dan Cornilescu's user avatar
7 votes

How to create staging servers for multiple git branches?

1) How can I run several different branches on the staging server? Docker 2) How would I set up the DB evolution system to make sure it always has appropriate DB for each branch? This depends on ...
James Shewey's user avatar
  • 3,732
6 votes
Accepted

What is the cleanest branching strategy to use when creating reusable artifacts?

The simplest/cleanest branch strategy is IMHO the one used in continuous deployment: a single/main integration branch which is also your release branch. From What is Your Branching Model?: ...
Dan Cornilescu's user avatar
6 votes

How to transition from a complex branching reality to a single-branch model?

When migrating from something to something else, there are only two things you need to define: What is your target How to get there (the migration plan) The first part is, sadly, often overlooked or ...
Alexandre's user avatar
  • 1,965
5 votes

How to get rid of develop branch for simplified Git flow

You are already building and testing code on each of the pull-request and hot-fix branches. This means that in aggregate, the sum of all branches pending on pull-request are your virtual develop ...
Evgeny Zislis's user avatar
3 votes
Accepted

How to avoid branchageddon with large organisations?

As Michael mentioned, offer a standard solution based on release versions/numbers, with a reasonably long lifespan for your industry (maybe interleaved with one or more shorter lifespan intermediate ...
Dan Cornilescu's user avatar
3 votes

How to get rid of develop branch for simplified Git flow

Well @dan-cornilescu says it well for your particular problem, but the more general case for Trunk-Based Development (mentioned in the Continuous Delivery, Lean Enterprise, and The DevOps Handbook) is ...
paul_h's user avatar
  • 314
3 votes

How to transition from a complex branching reality to a single-branch model?

It is actually very simple to convert a multi-branched hydra repository into a single branched model. First, you want to start with the branches which have the least difference between itself and ...
avi's user avatar
  • 1,279
3 votes

Trunk Based Development - release branch testing

There are different strategies and, depending on your specific problem domain, you need to decide what makes sense for you. For server side applications, especially micro services, you typically don'...
Philipp Claßen's user avatar
3 votes

Deploying and testing features on a server by more than one developer

Since you have a single released version product one thing to consider would be keeping the Develop branch or not: keeping it would have the advantage that at any moment you can bring in a hotfix in ...
Dan Cornilescu's user avatar
3 votes
Accepted

Would choosing the integration branch strategy be part of DevOps?

Branching strategy is a very clearly a business decision in which the DevOps engineer should be the primary expert, explaining all the trade offs. There are some strong positions on this issue in the ...
Jiri Klouda's user avatar
  • 5,807
2 votes

What branching strategies/workflows are available for Git repositories?

You can read book about best practices for git: https://git-scm.com/book/en/v2 Example for some git strategy in project: Creates branch named like a task, feature/XXX-1 Sending task for review If ...
Quarind's user avatar
  • 181
2 votes

How to create staging servers for multiple git branches?

I'd argue that this isn't actually about staging servers. A staging server closely mimics the production environment, and is where a release goes immediately prior to going to production. A feature ...
Xiong Chiamiov's user avatar
2 votes
Accepted

What is the difference between The Shared repository model and fork and pull model?

The most obvious difference is the permissions model. With forking, you don't have to grant someone access to your repository. In open source communities, this is a huge benefit. Within an ...
Preston Martin's user avatar
  • 3,278
1 vote
Accepted

One azure-pipeline.yaml for staging and production

Ok, found it here: Build.SourceBranch The branch of the triggering repo the build was queued for. Some examples: - Git repo branch: refs/heads/master - Git repo pull request: refs/pull/1/merge ...
cheslijones's user avatar
1 vote
Accepted

How do I trigger a build pipeline on a TFVC branch commit to map and get that branch?

You've discovered one of the great pitfalls with TFVC. I have also not found an answer to this issue. The only possible option I've seen around getting code from TFVC out of different branches is to ...
Peter's user avatar
  • 221
1 vote

How to avoid branchageddon with large organisations?

Maybe if you maintained branches per versions instead of per customers it could help reduce their number? Otherwise the only way to really get away from it is to be able to host the software yourself ...
Michael Pereira's user avatar
1 vote

How to create staging servers for multiple git branches?

That is what gitlab does best, consider to move to gitlab, setup a kube cluster and auto deploy. This will deploy each branch to an unique URL for testing.
Danny Goossen's user avatar
1 vote

Should I use release branch to push my changes?

What is the recommended practice? The book ”Accelerate” by Forsgen, Humble and Kim documents their research that teams that use fewer long-lived branches are more successful. The question is then ...
simbo1905's user avatar
  • 1,172
1 vote
Accepted

CI/CD pipelines Azure devops automatic merge after deploy release

A few questions so I can better understand your use case: How often would this deployment/build of yours be run? Will there ever be any changes going into Master that do not come from develop? If ...
AHaleIII's user avatar
  • 279
1 vote

CI/CD pipelines Azure devops automatic merge after deploy release

I would look into Azure Functions. Create a gate trigger and enable azure function after a successful release. References: https://docs.microsoft.com/en-us/azure/devops/repos/git/create-pr-status-...
Richard Hughes's user avatar
1 vote

Alternating VC branches to build deployment artifacts for different environments

You can create a release process to manage deployments in your environments. A plugin that can help you is the maven-release-plugin, where you 'freeze' the package and can promote them between ...
dalmo.santos's user avatar

Only top scored, non community-wiki answers of a minimum length are eligible