Questions tagged [branch]

For question about branches in revision/version control systems

From Wikipedia:

Branching, in revision control and software configuration management, is the duplication of an object under revision control (such as a source code file or a directory tree) so that modifications can happen in parallel along both branches.

Branches are also known as trees, streams or codelines. The originating branch is sometimes called the parent branch, the upstream branch (or simply upstream, especially if the branches are maintained by different organizations or individuals), or the backing stream. Child branches are branches that have a parent; a branch without a parent is referred to as the trunk or the mainline.

...

Branching also generally implies the ability to later merge or integrate changes back onto the parent branch. Often the changes are merged back to the trunk, even if this is not the parent branch. A branch not intended to be merged (e.g. because it has been relicensed under an incompatible license by a third party, or it attempts to serve a different purpose) is usually called a fork.

19 questions
24
votes
4 answers

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 be released / released version feature branches:…
Fabian Schmengler
  • 485
  • 1
  • 4
  • 11
15
votes
4 answers

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 complex branching reality to a single-branch model like…
Dan Cornilescu
  • 6,780
  • 2
  • 21
  • 45
10
votes
2 answers

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 instead only high/critical security patches and bespoke…
Mark Wheeler
  • 103
  • 4
8
votes
3 answers

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 be database evolution scripts (straight SQL) that…
max1221
  • 81
  • 1
  • 2
7
votes
1 answer

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 merged into master and then built to be deployed…
tayworm
  • 670
  • 3
  • 8
7
votes
2 answers

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. Ideally a summary of pros/cons and maybe intended usage…
Dan Cornilescu
  • 6,780
  • 2
  • 21
  • 45
5
votes
2 answers

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 integrate 20 features in a certain interval of time…
Dan Cornilescu
  • 6,780
  • 2
  • 21
  • 45
4
votes
1 answer

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 merges the feature into the Develop branch. Developer Two also…
Rym
  • 41
  • 1
3
votes
1 answer

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, prioritize and eventually get there. I feel that its not…
VKR
  • 71
  • 1
  • 3
2
votes
1 answer

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 application stack. Version control is SVN for the time…
amphibient
  • 453
  • 6
  • 12
1
vote
1 answer

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 the agent job must map and get the relevant branch…
0
votes
3 answers

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, there is still some amount of manual testing and…
Zanky
  • 21
  • 3
0
votes
2 answers

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 (defined in the release pipeline of azure devops)…
0
votes
1 answer

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. Branches: -> When a release is planned a new branch…
Vivek
  • 5
  • 1
  • 5
0
votes
0 answers

Azure DevOps REST API – Create a YAML pipeline targeting a specific Git branch

I’m trying to create a pipeline in Azure DevOps using the REST API. My goal is to create a pipeline that references a YAML file located in a specific branch of a Git repository According to the documentation, I’m making a POST request…
1
2