Questions tagged [branch]
For question about branches in revision/version control systems
18
questions
23
votes
4
answers
5k
views
How to get rid of develop branch for simplified Git flow
In a continuously developed web project (not a product) we currently have the following branching strategy, roughly based on git flow:
develop branch: latest working version
master branch: version to ...
15
votes
4
answers
440
views
How to transition from a complex branching reality to a single-branch model?
In large organisations, using the waterfall methodology typically results in very complex branching structures (aka branch spagetti).
What branching strategies can be used to transition from a ...
- 6,730
10
votes
2
answers
143
views
How to avoid branchageddon with large organisations?
How do you avoid a branchageddon situation when working with large organisations?
We work with a number of large financial organisations whose approach is to not take updates to software, but ...
- 103
8
votes
3
answers
3k
views
How to create staging servers for multiple git branches?
I have to create a new staging process for our development and testing.
At any given time, there are only around 4 git branches actively being developed and tested. Within each git branch, there may ...
- 81
7
votes
2
answers
408
views
What branching strategies/workflows are available for Git repositories?
I'm looking for a high-level, summary description of the recommended branching strategies/workflows primarily applicable with Git, which would serve as a guide for navigating this environment.
...
- 6,730
7
votes
1
answer
846
views
What is the cleanest branching strategy to use when creating reusable artifacts?
If I have 3 environments : integration, staging, and production, what is the cleanest branching strategy to use, assuming I want to reuse my deployed artifact?
For example, should feature branches be ...
- 650
4
votes
1
answer
93
views
Deploying and testing features on a server by more than one developer
I have 4 environments (prod/preprod/SIT/DEV), also two main branches (Master & Develop), two developers work on features (One & Two).
Developer One creates a feature (Feature A), he then ...
- 41
4
votes
2
answers
287
views
Would choosing the integration branch strategy be part of DevOps?
In a mature DevOps organisation would choosing a product/product line integration branch strategy be part of DevOps?
What do I mean by integration branch strategy?
For example a product team has to ...
- 6,730
3
votes
1
answer
390
views
Trunk Based Development - release branch testing
We are currently using Git flow branching strategy and looking to go to a trunk based strategy - although we are quite a ways away from getting there I am trying to get all my ducks in a row, ...
- 71
2
votes
1
answer
58
views
Alternating VC branches to build deployment artifacts for different environments
We use Jenkins for CI. The app is written in Java, built with Maven (invoked manually in local dev environments and by Jenkins), deployed on various Tomcat servers. Nothing unusual about the ...
- 443
1
vote
1
answer
332
views
How do I trigger a build pipeline on a TFVC branch commit to map and get that branch?
I have project in DevOps TFVC not Git. I use branches, they live and die in the order of months. I want to create a build pipeline that is triggered when a commit is done on any of the branches and ...
- 113
0
votes
1
answer
18
views
What is the difference between The Shared repository model and fork and pull model?
I am trying to understand what is the difference between the two.
The Shared repository model: uses ‘topic’ branches, which are reviewed, approved, and merged into the main branch.
Fork and pull model:...
- 103
0
votes
2
answers
8k
views
CI/CD pipelines Azure devops automatic merge after deploy release
I have a classic env. setup like following:
I have 2 branches : Develop and Master.
Is there any way in azure devops to setup the following rule:
When a deploy is succeeded on dev environment (...
- 103
0
votes
2
answers
328
views
One azure-pipeline.yaml for staging and production
Currently I have two separate Azure DevOps Pipeline config files:
azure-pipelines-staging.yaml
azure-pipelines-production.yaml
Really the only differences in them are the:
trigger:
branches:
...
- 155
0
votes
3
answers
687
views
Should I use release branch to push my changes?
Should I use a release branch to push changes out to production or release it off master branch - the main pipeline where changes are merged by developers of their feature branches?
Not to mention, ...
- 21
0
votes
0
answers
139
views
is it possible to get web application url from branch without publishing it?
When working on the task we create git branch (AzureDevOps). In this branch we modify code in VS and can run web application on localhost. When it's done we commit changes and create PR. To test it ...
- 101
0
votes
0
answers
20
views
How to trigger pipeline if any 1 of x repos is merged to main branch
I am using a locally hosted version of GitLab Omnibus, and I stay up to date with the most current versions.
Here's an example of what I'm trying to do.
I have five repositories. They are not in the ...
- 101
0
votes
1
answer
915
views
Recommended SVN branching strategy for DevOps
We are using SVN as our version control system and we are using the below standard layout for our projects.
Tags
Branches
Trunk
Trunk:
-> Trunk will always hold the latest code changes.
...
- 5