All Questions
124 questions
1
vote
2
answers
143
views
Is my understanding of the GitFlow release process valid?
We currently use the GitFlow process to manage our releases (or so I think) for a native iOS app.
Here are the steps we carried out for context:
We created a new repo with the main branch
We then ...
- 111
-2
votes
1
answer
119
views
How Can GitFlow Work for Multi-Product Releases?
I am looking to adopt GitFlow for a multi-product repository. This repo contains multiple on-prem applications and libraries. Due to the nature of the products, releases are not frequent and we do not ...
- 21
1
vote
1
answer
274
views
Git Flow best practice for quarantine snapshot to staging environments (dev, test, prod)?
I have a CI pipeline that creates snapshot artifacts with constant version numbers after each commit to the development branch. Then the snapshots are deployed to the stages (dev, test) sequentially ...
- 13
0
votes
6
answers
945
views
How to use trunk based development when using Scrum [closed]
In Scrum we do a 2 week sprint and ship the features after the sprint. I have heard a lot of good things about TBD, but does it conflict with Scrum? Can anyone share your workflow if it is possible ...
- 791
2
votes
3
answers
1k
views
Is my git branch strategy best practice?
We are a small software team with 6 members. We are working on different software projects in our company.
Before I joined the team no version control system was used. It was/is my task to reorganize ...
- 41
2
votes
2
answers
764
views
Where to tag releases to achieve "build-once, deploy-everywhere" using GitFlow?
TL;DR: Using GitFlow, which commit do you tag to identify the build of your next release? If you tag the merge commit on main, you'll need to rebuild and deploy something you didn't test on QA (and ...
- 139
1
vote
2
answers
285
views
Can 1.0.1 be "applied" in 1.0.0 and in 1.1.0?
Regarding my last question: Can 1.0.1 be launched right after 1.1.0?. I learned that releases can be maintained in parallel using SemVer and it is possible to apply it using Git Flow (Reference: Post ...
- 47
0
votes
3
answers
552
views
Can 1.0.1 be launched right after 1.1.0?
I know that it is common for software to have parallel development in major versions, such as v1 (1.x.x), which can be completely different from v2.
Regarding Semver (Semantic Version), can I upgrade ...
- 47
2
votes
4
answers
8k
views
How to maintain development,testing and production branches when the number of devs is around 50?
Currently my code base has 3 deployments: "development", where devs unit test and develop features; "testing", where testers run end user verification for the features; and "...
- 45
0
votes
2
answers
431
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
2
votes
4
answers
4k
views
How do you deploy and test a hotfix repo branch in different environments, Git Flow variants
I have done thru where do bug fixes go in git flow and the git flow and github flow pages.
There are scenarios many times when we need to show demo of new functionality and on same day fix issues of ...
- 610
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
2
answers
657
views
A feature branch on top of another feature branch (dealing with PRs)
As shown in the following image, I have two different branches with their corresponding PRs (PR1 and PR2). The top arrow is the develop branch.
PR2 is build on top of PR1. PR1 is build on top of ...
- 119
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
10
votes
3
answers
21k
views
What is the difference between trunk based development and gitflow?
I've been searching the internet and I can't find a good question to this so I believe I have a fundamental misunderstanding on what they are.
Is the only difference that in gitflow there is a release ...
- 2,860