Questions tagged [branching-strategy]
153 questions
1
vote
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
- 9,653
- 16
- 82
- 149
1
vote
1 answer
Monorepo with a common library release to only update one project
I have a monorepo, that has say 5 .net core APIs, and the all use several common libraries:
/api1
/api2
...
/api5
/common1
/common2
I am using a single master branch strategy and want my master branch in sync with what is deployed to my production…
user210757
- 6,996
- 17
- 66
- 115
1
vote
1 answer
Branching strategy for working with outsourced team?
I am planning to manage an outsourced dev team working on my codebase by having that team work in feature branches for all the work they have been assigned. They would be responsible for merging changes from the trunk weekly. My own team would also…
Don Zacharias
- 1,544
- 2
- 14
- 31
1
vote
1 answer
Choosing prefix name on creating new branch
In our company, we use azure-devops and edited some settings about folder hierarchy (hotfix, feature, bugfix etc.) with this documentation.
We want to choose one of those prefix names and type branch name. For example, I choose feature and type…
ddagsan
- 1,786
- 18
- 21
1
vote
1 answer
Branching model for team builds through git
We are trying to incorporate the team build concept in a team. I do not know exactly what's the professional name it has but the scenario would be self-explanatory what we want to achieve. I've tried searching it on the portal but could not find…
Suraj Sharma
- 49
- 6
1
vote
1 answer
Gitlab CI automatically rebase master branch when review branch merged
We use a peer-review process where reviewers are asked to merge in to a Review branch when done.
Thing is, after review, we wish that our master branch gets automatically rebased with what Review branch has. This would reflect our current manual…
Javier Novoa C.
- 11,257
- 13
- 57
- 75
1
vote
3 answers
How does the git's "local-repository" concept differ from "developer branches"?
In a previous job, I found easier to manage and keep a stable pre-release branch (or main, depending on setup) by having each developer work on his/her own branch. We only had a single production instance, so no need to support multiple versions of…
Carlos Bittencourt
- 352
- 1
- 3
- 9
1
vote
1 answer
How do I configure gitVersion to increment patch per commit on release branches
We are following trunk based development approach, where when a feature is ready, we merge it to master and create release branch with semantic version, so we have full control on major/minor/patch versioning,
eg :
release/1.0.0 .
release/1.0.1 etc…
nikned
- 171
- 2
- 12
1
vote
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
- 34,745
- 30
- 150
- 304
1
vote
1 answer
git flow with two master branches, is it possible?
I am working in a project with a weird branching scheme. Let's say this is a shared project repository that holds a few websites (just an example below):
http://web1
http://web2
http://web3
http://web4
from the sites above web1, web2, web3 shares…
ReynierPM
- 17,594
- 53
- 193
- 363
1
vote
1 answer
Working with main and dev branches in TFS
I have to upload a new project to TFS. This project is already finished but it is not under control version yet.
I have decided to work with two branches: main, dev. In my case release is not necessary, I can do all the stuff using feature isolation…
Willy
- 9,848
- 22
- 141
- 284
1
vote
1 answer
Specific git configuration
I have a workflow in which I need to have some features shipped to dev for testing before they are pushed to prod. The problem is that some of these features need to stay on dev server indefinitely and never be pushed to production server, so I…
Eugene
- 10,006
- 4
- 37
- 55
1
vote
1 answer
Git branching strategy for small frequent features targeting single environment
Our development process is similar to the one described in this question and requires creation of many small features. Usually 4-8 features per day. All features should be deployed to the same test environment, so there should be single test…
Max Khamrovskiy
- 13
- 2
1
vote
1 answer
What does the impact search annotation do in MiniZinc?
In MiniZinc it is possible to use the search annotation impact, it is explained as follows on the official website:
annotation impact
Choose the variable with the highest impact so far during the search
What does this mean in practice? What is the…
Atonic
- 509
- 1
- 5
- 14
1
vote
1 answer
Reference another project in a brach
Using visual studio I'm struggling on how best to setup branching when I need to call a class contained in another project. Assume the following structure of my project:
Solution
- Project 1
- project 2
- Project 3
- Utility
When I branch my…
Banjaxx
- 624
- 2
- 18
- 34