Questions tagged [gitflow]
git-flow is a popular workflow that extends the verbs available to git and helps handle moving changes between feature, development, release, hotfix, support, and production branches.
153 questions
2
votes
2
answers
201
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 ...
- 121
-2
votes
1
answer
145
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
300
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
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
1
vote
2
answers
302
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
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
-1
votes
1
answer
192
views
Migrating from Bitbucket to Github and using Git Flow
In our team we have up to 50 repos, of which about 15 are worked with regularly. The others are rarely changed, but it happens that we bring in 1-3 additional repos per release and work with them.
We ...
- 11
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
4
votes
1
answer
4k
views
GitFlow merge conflicts between release and develop
I've been using Git and GitFlow for quite a few years now, but this is still confusing me.
Let's say I open branch release/1.1.1 to let the stakeholders test their application.
While they're testing ...
- 161
3
votes
2
answers
1k
views
Git flow for multiservice monorepo
My project is a monorepo where the top level directory contains build infrastructure and a set of project directories for different services. Each service has its own branch of development. The ...
- 39
3
votes
1
answer
414
views
I need help understanding a seemingly broken Git release flow
First some context. Working in teams which use a CI environment, many people will know the typical Gitflow release process.
Without going into too much political detail, the company I currently work ...
- 53
5
votes
5
answers
8k
views
How to properly manage bugfixes for released versions in git flow
We follow git flow, see https://nvie.com/posts/a-successful-git-branching-model/
Lets imagine the following situation:
We have a current version 2.0.8 on our prod environment. After a while, several ...
- 408
0
votes
1
answer
347
views
How should I handle production rollbacks and eventual hotfix using gitflow?
I want to implement gitflow but I have a question.
Let's imagine I have release version 1.0.0, it works nicely so I merge it into master.
We deploy and it goes to prod.
Sadly we didn't notice ...
- 171
2
votes
1
answer
877
views
Git workflow - when exactly do you need dedicated branch for release
I have worked with Git workflows where we release from dedicated branch specifically used for release (e.g. Gitflow's master/main branch). In such workflows, there will be multiple (at least 2) long ...
- 147
0
votes
1
answer
628
views
Why are several versions in production a key to choose GitFlow over GitHub flow?
I've seen in many places, one of them here (and also in the guiding questions of GitVersion) that, when coming to determine whether or not to use GitFlow, one key consideration is whether or not I ...
- 172
0
votes
2
answers
1k
views
Why is master branch important in GitHub flow?
First let me phrase my understanding of GitHub flow before asking the question:
In GitHub flow, we have a main branch, and feature/topic/bugfix/whatever branches branching off that main branch. Once ...
- 172
0
votes
2
answers
561
views
Release Management best practice for cross-functional teams
I want to know about best practices for release management of a product-technical team with about 7 cross-functional teams included.
We changed our team structure to something like Spotify Squads ...
- 117
0
votes
1
answer
1k
views
What to do with a big pull request for just one feature?
We are using git flow as a branching model, and we have a feature ticket that conceptually is a pretty small feature in the software management tool, in this case Jira.
The thing is that the code on ...
-1
votes
1
answer
125
views
Gitflow - Share release branch executable with tester before tagging it
I use GitFlow as a workflow for versionning for less than 1 month. I've just finished to develop a feature branch which has been merged to develop/. Now, I'm starting a release branch from develop. ...
- 107
-2
votes
1
answer
321
views
How to handle dependencies between branches in git-flow?
I've been working on feature_A while another dev works on feature_B. Now, the other dev needs a small functionallity that's implemented in my feature_A, but I've not finished the whole feature itself. ...
- 127
69
votes
8
answers
17k
views
In code review, should I ask to do a refactor outside of the scope in a pull request?
I have been studying the best practices for a code review, and I was wondering what to do in the following scenario:
During a code review, I see potential improvements, but decide that they are ...
- 817
0
votes
5
answers
1k
views
How to reduce the merge-redundancy due to testing in our Git workflow?
We have are a small team of 6 people working with Scrum and Git.
We are developing a quite complex webapplication with the ZK Framework. It uses Java and a MySQL database.
We have adapted the "Git ...
- 340
13
votes
2
answers
7k
views
Is cherry-picking commits into master (instead of merging) a good idea?
Background
At work we've been trying to find a new workflow. We currently follow git-flow pretty closely. We don't have release branches; we just merge develop directly into master once we feel like ...
- 1,026
2
votes
1
answer
3k
views
How to cope with production rollbacks when using gitflow
We're reviewing the popular Gitflow as our git branching model and I've liked it so far. One case I'm not sure about is the production rollback. Say we've there's a new feature that we're planning to ...
