Stack Overflow
Stack Overflow

Questions tagged [branching-strategy]

153 questions
0
votes
0 answers

Git checkout again only files initially checked out from another branch

I need 20 branches, each branched from a single main feature branch. These branches will be used to generate pull requests (BitBucket) repeatedly as work progresses. So every now and again, I want to checkout a PR branch, then checkout again from…
quickdraw
  • 101
  • 8
0
votes
3 answers

Git branching strategy - merge conflicts between feature branches

We have the following remote branches: master staging develop each are tied to their own server and will deploy when a commit is pushed. a team member will work on a feature branch myfeaturea which is based off master and merge into develop. In this…
good_afternoon
  • 1,529
  • 1
  • 12
  • 41
0
votes
0 answers

Efficient dominating set using branching

Exact dominating set is a dominating set in which exactly one element of N[v] belongs to dominating set.I have used branching to find a solution.if a vertex v is selected then N[v] is deleted and N^2(v) is colored blue.I am not sure if my solution…
rajath rao
  • 1
  • 1
0
votes
1 answer

How do I split a branch up into several parallel branches off the same root?

A feature request (tooBigFeature) has spiraled into a 100-commit, 50-file PR, which, at the end of review, engineering has decided it wants in 10 5-file PRs (tinyFeatureChunk-01, tinyFeatureChunk-02... etc) - all off a common single commit on our…
Sean Munson
  • 343
  • 2
  • 9
0
votes
1 answer

Managing feature dependencies in git

I have multiple features that are developed in an organization. Let's say these features are developed within a team and cross team. Lets say feature/CT1 and feature/CT2 are cross team branches. These has dependency on feature/WT1, feature/WT1.1 and…
Tirumal Sutrave
  • 16
  • 2
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,911
  • 3
  • 24
  • 44
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
  • 783
  • 1
  • 14
  • 38
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
  • 1
  • 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

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
  • 4,649
  • 6
  • 51
  • 65
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
  • 505
  • 1
  • 9
  • 22
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
  • 111
  • 8
1 2 3
…
10 11