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
172 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
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
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
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
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
-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
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
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:...
