Stack Overflow
Stack Overflow

Questions tagged [branching-strategy]

134 questions
1
vote
1 answer

How do you work with git as part of a team, with lots of small changes

Looking for some advice and input in how to work effectively with git/source controls. I work as part of a team of 5 developers. One of our biggest clients has a huge site built in Wordpress with lots and lots going on. We use Bitbucket for our…
Francesca
  • 22,178
  • 26
  • 80
  • 145
1
vote
2 answers

ALM Basic Branch Plan - Purpose of Release Branch?

The Microsoft ALM Team describe the Basic Branch Plan as needing a MAIN, DEV, and RELEASE branch. I am working on introducing branching/merging to a new team who currently uses source control with no branches whatsoever. I was wondering how the…
Issa Fram
  • 2,318
  • 6
  • 32
  • 59
1
vote
2 answers

What is the best approach for control version branching in Scrum?

Having multiple teams working on a single product with a single Product Backlog, is it a good idea for each member of those teams to frequently commit their code to the trunk, rather than having branches for each team? So they would be working…
Ajeet Singh
  • 369
  • 6
  • 19
1
vote
1 answer

Split commits between git branches

This is interesting question (or at least I hope it is). I have been working on feature and have git branch with those changes. I need to create pull request to master (which I have rebased, I can revert) but my collages are complaining that pull…
Haris Krajina
  • 13,161
  • 12
  • 56
  • 75
1
vote
1 answer

Do you really need to version the trunk of a maven project?

In a Trunk Based Development branching model, where you develop on the trunk and release from a branch, every release requires updates to POM files in both the trunk and the new branch. For example, if the version in the trunk is set to…
richard ward
  • 13
  • 3
1
vote
1 answer

Suggestions on naming convention for Branches

We have two separate artifacts in Visual Studio Team foundation Server, one for Source code (branch) and another for Database scripts (folder). branches are - 3.0, 3.1, 3.2 ... to 3-mainline, and we also have 4-mainline. actually 4-mainline (4.0) is…
user3453636
  • 67
  • 9
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
  • 750
  • 6
  • 18
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
  • 587
  • 4
  • 14
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…
MKN Web Solutions
  • 2,615
  • 3
  • 32
  • 47
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,339
  • 1
  • 11
  • 26
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
  • 156
  • 9
0
votes
0 answers

Git branch is behind, but contains the same code after double merge

For a project I've been working on we decided to work with a Git Flow oriented branching strategy, but were having some issues. Basically before every release, a branch is made from our develop branch to do some last minute bug fixes. This branch is…
wbenoot
  • 1
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
0 answers

Specifying a branchname to release in jenkins maven-job

I use a maven-job in Jenkins that gets the text-parameter "TAG" where the user is meant to name a new Tag that should be generated in git and be used to branch out. I'm fairly new to programming, so I'm sorry if this is ridiculous but I tried to…
Lena
  • 1
1 2 3
…
8 9