Questions tagged [branching]
Branching, in revision control is the duplication of an object under revision control so that modifications can happen in parallel along both branches.
253 questions
2
votes
2
answers
177
views
Internal Library Versioning Strategy and Release Workflow
At our company, we're planning to develop a set of libraries within a mono-repository, with the goal of maintaining a unified version across all of them. This ensures that when teams include our BOM (...
- 139
2
votes
2
answers
1k
views
What are the pros and cons of using cherry-pick versus merge for release management? [closed]
What are the pros and cons of using cherry-pick versus merge for release management?
Background
We have a dev branch, and just created a release1 branch from it. Folks will commit relevant content to ...
- 565
0
votes
1
answer
132
views
Two parallel programs of work hitting a single production environment
We have two programs of work targeting the same production environment. For convenience, and to show “progress” the programs have split their SIT environments.
The API team has chosen to not split its ...
- 487
-1
votes
1
answer
873
views
How to promote code to different environments in GitFlow branching strategy
I am a one person team of my project.
I have adopted GitFlow branching strategy for my project which I have read from here, excluding the release branches because I am the the only developer in the ...
- 223
0
votes
1
answer
95
views
Git: Trunk based development for change to build sytem and documentation
I want to adopt trunk based development for an opensource product and but I am not sure how it can be applied to documentation and build system changes.
Feature flags does not help for things that are ...
- 101
0
votes
2
answers
466
views
Workflow for Writing Database Migrations for a Team
I am wondering what some possible workflows are for writing database migrations for a team of developers. We seem to run into a problem where one person writes a migration, names it and gives it a ...
- 109
3
votes
2
answers
4k
views
Branching strategy for multiple team working on same repository
I am trying to come up with a branching strategy.
We have two teams working on the same product which is kept in one repository. Both teams have different release plans and if both teams merge on ...
- 139
0
votes
3
answers
992
views
Is there any advantage of pushing branches to GitHub without an associated PR?
I work with other Software Engineers on a web app product. Also, the source code is hosted on GitHub.
There is a behavior pattern that I do not understand. Some co-workers push branches (adding ...
- 149
1
vote
1
answer
3k
views
Branching strategy for developing multiple features at the same time
We are doing a mobile app development and currently, we have Dev - UAT - Staging - Main branches.
We branch from the Main branch as feature/fA for feature development.
We do our development in that ...
- 135
2
votes
3
answers
3k
views
How to maintain multiple release branches simulateously (git)
This question has probably been discussed to death, but I don't feel like I have a good answer. I work at a company where customers are on different versions of our product. When a bug is found, we ...
- 2,583
-1
votes
2
answers
4k
views
Can I split a feature branch and then merge it back to the origin master branch without any issues?
I'm working on a project where the master branch is protected.
Usual workflow: Always create feature branches off master and then send PRs. Once that has been merged into origin/master, I can pull it ...
- 127
3
votes
3
answers
453
views
Static types and dependencies in trunk-based development
There're certain things in code that can't be conditional. Two very common examples:
static types
dependencies.
You can't naturally enable/disable a feature that implies a new dependency or a new ...
- 149
1
vote
1
answer
1k
views
Working on different release branches at the same time using git flow
In git flow, there is a point where you decide to create a branch from the current develop being the new release. For example 1.7. Everthing that is ready to this point is considered beeing in that ...
- 408
1
vote
2
answers
812
views
Where to put technical updates in git branching flow?
From time to time you need to do technical updates, like:
Update versions of your dependencies
Update the version of your parent POM, you build tool etc.
Leave out those updates that have a firm ...
- 700
4
votes
4
answers
3k
views
Git: Best practices for using updates from one branch in another
My team is working on building a bunch of automated tests for our project. Each automated test targets a "customization" our client ordered to modify an existing website.
The current flow is:...
