Stack Overflow
Stack Overflow

Questions tagged [branching-strategy]

153 questions
1
vote
3 answers

git workflow: several developers, only 2 branches

I've the following situation: One internal server (server1) with the main repo with 2 branches master and dev, four developers with 3 clones of the git working with branches of the dev Rules: the server1/master cannot be touched or merged by the…
user3351916
  • 11
  • 1
1
vote
0 answers

Git incorrectly indicating during merge that file has been delete on other branch

I have two branches, A and B, both of which have a file X. These branches started from one code base but have since then interweaved merges into each other because they're branched for different implementations of the project. X has been updated in…
noisebelt
  • 940
  • 2
  • 9
  • 20
1
vote
1 answer

Issue with clearcase branch per task strategy

I have a problem here with the branch per task strategy in clearcase. We are using snapshot views. We have various task branches and an integration branch. So, we merge the branches to integration for testing. Now, suppose I am working on a file…
user2636464
  • 685
  • 7
  • 17
1
vote
1 answer

GitHub: Merging old branches

So say you branch off your master to create a "new feature #101" for your application. Now this feature isn't going to be pushed to the master until X months from now (we'll say 3 months). In that 3 month period, say we branch off other features…
Michael Mikhjian
  • 2,760
  • 4
  • 36
  • 51
0
votes
1 answer

How is branching logic coded when dealing with a checkbox answer in RedCAP?

This is my branching logic for the progress bar on one of the questions before we get to the checkbox one: ( this works) ([age]<>"" AND [education]="" AND [relationship_to_child]="" AND [are_you_the_sole_caregiver]="" AND…
Karen Redhead
  • 1
  • 2
0
votes
1 answer

Using list of indexes to append underscores to string tokens

The design of this is not meeting expectations: # Explanation: # Read split of splits until index of indexes reached. Apply underscore to split token with no space if split followed by another index # Therefore line output should be: '7 Waitohu Road…
Dave
  • 687
  • 7
  • 15
0
votes
0 answers

How to enforce Trunk-based branching strategy in Bitbucket?

As a code owner I'd like to enforce trunk-based branching strategy in my Bitbucket repository. I tried using Branch Permissions, but once I set change prevention on all branches, I cannot exclude 'trunk' from it. I tried to set it in…
rotimislaw
  • 61
  • 4
0
votes
0 answers

Using GitLab Flow, how do individual changes get merged from lower to higher environments?

I'm evaluating GitLab Flow as a potential branching strategy for a team of about 20 developers. The process that's unclear to me is how changes are "promoted" to the higher environments. Following the example in the linked document, let's assume…
Jesse Kearns
  • 1
  • 2
0
votes
1 answer

Can Cplex prioritize a variable over the others when branching?

Using C++, I have two sets of binary decision variables, y[i] and x[i][j]: IloNumVarArray y = CreateNumVarArray(env, int1, "y", 0, 1, ILOINT); NumVarMatrix x(env, int1); for (IloInt i = 0; i < int1; ++s) { x[i] =…
Ozan Aksu
  • 17
  • 2
0
votes
1 answer

What versioning strategy to adopt for a project that is customized for different clients?

I am curious about what source versioning strategy would others apply on a java project (web application) which is very probable to have customization for several customers. The project will have a standard version, but for some of its customers…
marius_neo
  • 1,535
  • 1
  • 13
  • 28
0
votes
1 answer

gitflow branching strategy with bitbucket

I am trying to implement gitflow branching strategy and trying to understand how to resolve the problem I am facing. if you think there is a better branching strategy which could solve this issue please let me know. how to handle parallel…
Gaurang Shah
  • 11,764
  • 9
  • 74
  • 137
0
votes
1 answer

What's the way using Sparx Enterprise Architecture by different user?

As Sparx EA is a versatile software, I want to know how we can use it in a team, by different levels of admin, and how we can create different level of access? it's possible by cloud that exist in Sparx sources? or can we execute it in internal…
atefe
  • 1
  • 1
0
votes
1 answer

Using Git to merge a branch onto two other branches that are not identical

I have two branches, ServerA and ServerB. The code in both is nearly the same, but not identical. ServerB branched off of ServerA in the past. I want to create a new dev branch with code changes that will be merged into both of the server…
Wisconsin Wes
  • 1
0
votes
2 answers

git: Why is it so difficult to get the parent branch name?

It is difficult to find the parent-branch in git ... My current solution: git show-branch -a 2>/dev/null \ | grep '\*' \ | grep -v `git rev-parse --abbrev-ref HEAD` \ | head -n1 \ | perl -ple 's/\[[A-Za-z]+-\d+\][^\]]+$//;…
guettli
  • 25,042
  • 81
  • 346
  • 663
0
votes
1 answer

How to manage the incomplete features in Azure repos

I'm new to DevOps and want to know how to manage the project in Azure Git repos. I have chosen the Trunk based branching strategy for the development, where we will have the main branch, feature branches, release branches, and bugfix branches (to…
Saurabh khandelwal
  • 43
  • 1
  • 6
1 2 3
…
10 11