Stack Overflow
Stack Overflow

Questions tagged [branching-strategy]

134 questions
0
votes
2 answers

Azure DevOps and Release flow, hot to handle versioning when hotfixing?

During the past few days I have struggled with how to handle versioning and our branching strategy while using Azure DevOps, so I decided to find some more information regarding how Microsoft does it.. However.. the versioning-part isnt really…
Inx51
  • 1,515
  • 2
  • 17
  • 32
0
votes
1 answer

Target and Source branch are not merged in GitLab pipeline

I'm currently experimenting with GitLab. Currently, I'm using the free online version of GitLab and I like it very much. But at the moment, I'm trying to understand the "Merge Request" strategy. Given I've two branches: master mydev Now, assume…
Nrgyzer
  • 353
  • 7
  • 20
0
votes
1 answer

Create new branch and move uncommitted working copy changes to it using SVN

In git, I would typically do something like: git checkout -b my-new-branch-name , and this would copy all my uncommitted working copy changes into the new branch my-new-branch-name and move the head to that new branch. How would I do the same in…
pixel
  • 6,765
  • 12
  • 60
  • 101
0
votes
0 answers

Projecting a staging concept on branching model

I have a tool that uses an old source code management with a staging concept: 1. Dev 2. Test 3. Production Modifing an element (a file) moves it to the dev-stage and will be stored there. It has to be moved by the developer through test in…
Mike
  • 13
  • 4
0
votes
0 answers

What are the differences between gitlab flow with Release Branches and Microsoft's Release Flow?

My team is transitioning from svn to git. We are in the process of selecting a git workflow. I appreciate that a lot of people use gitflow but it seems unnecessarily complicated to me. I don't know why we would want a develop branch separate from…
shanz
  • 53
  • 6
0
votes
1 answer

What is the best Git model for a scenario where there are multiple hierarchies?

I'm a QA and I will have to maintain multiple scripts belonging to multiple modules, of many projects of one Organisation. To make it easier - Organisation X has 3 Projects - A,B,C Each Project has 3 Modules Each Module has 10 functionalities, so 10…
Shantharam Puranik
  • 1
0
votes
1 answer

Why do we need release branch for QA repositories

I understand the need for release branches, feature branches etc., for the code/repositories of the product. I would like to understand why do we need various branches for the automated tests repositories.
Sandhya
  • 9
  • 3
0
votes
1 answer

Will git log --cherry-pick --right-only --no-merges ignore all commits correctly cherry-picked between branches?

I work in a large software team doing large monthly releases. We work on a branch to release model (see diagram). This model solves a lot of problems, but has some risks to manage. When I go to release branch 1.1 to production, I need to check…
hawkeye
  • 31,052
  • 27
  • 133
  • 271
0
votes
1 answer

How to create releases on master using squashed merges

We use a master/staging/feature branch strategy. master & staging are long lived, and feature branches only exist until merged with staging. When merging staging into master, our jenkins server squashes the commits to create a single "release"…
aj-ee
  • 1
0
votes
0 answers

dev branch diverges due to no-ff merge commits to master

I'm following a git branching model with two long running branches (dev, master) and where feature branches are based from master mostly (or dev sometimes) and merged to dev and then dev is merged to master after few features (all merges are no-ff…
hIpPy
  • 3,702
  • 5
  • 41
  • 57
0
votes
1 answer

Can I implement Branch target buffer in two stage pipelined RISC architecture?

I am trying to implement the BTB in low-level microcontroller such as PIC16. I don't know is it feasible or not. So wanted your suggestion. Thanks.
Pratik Katwate
  • 1
0
votes
1 answer

Simplify/Automate the branching in this If Statement

have posted about this before, and have received some very good awnsers recently though I still have not completely solved the issue. I now have some somewhat workable code, that I though someone on this site may be able to fix, or show me how to…
Jake
  • 1
0
votes
1 answer

How to structure Git branches

I have to setup git repository for development of software based on preexisting source code of a software vendor. The source code is being periodically updated, I'm looking for most effective approach, I've come up with 2 models of working and I…
michal.slocinski
  • 475
  • 1
  • 8
  • 19
0
votes
0 answers

Git Flow - Cherry Pick vs CI

I am searching for better workflow to use with Git. I found git-flow very useful workflow which fits in enterprise product based solution. The most useful functionality I like is of Cherry-Pick. Currently we are using SVN and it is bottleneck for us…
chynten
  • 83
  • 7
0
votes
0 answers

How do I create a branch specifically for builds?

I need to set up a branch made only for builds. I have a project made on JS with a server in another repo. Folder structure there is complex and there are lots of non-production files. What I need is a separate branch with this folder…
Михаил Кононенко
  • 1
1 2 3
…
8 9