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.
130
questions
0
votes
2
answers
90
views
Should integration tests run after updating the feature branch from master?
We have a suite of integration tests that take about 2 hours to complete.
Currently our flow is that each feature branch runs the integration tests, and only if the branch is updated from master and ...
- 109
1
vote
5
answers
385
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 ...
- 243
-1
votes
2
answers
110
views
Nightly build, GitFlow and PR [closed]
My customer decided to have an automatic nightly build based on develop branch.
We usually make a feature branch (and if it is necessary we provide a release compiled manually on that branch) and when ...
- 107
0
votes
1
answer
76
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 ...
- 103
2
votes
3
answers
166
views
Git tags as an alternative to --no-ff in gitflow
In https://nvie.com/posts/a-successful-git-branching-model/, Driessen suggests using the --no-ff flag to make the history of commits for the dev branch clear. This is an easy flag for individuals on ...
- 187
1
vote
1
answer
191
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 ...
- 137
-2
votes
2
answers
73
views
Feature branches vs controller extension
Note: Controller here refers to one from MVCs
Bear with me, I know these are seemingly unrelated. However, I'm inclined to think both are analogous to each other being that they're means to the same ...
- 135
0
votes
1
answer
254
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 ...
- 162
1
vote
1
answer
160
views
GitFlow question about develop and hotfix branches
I've read the canonical article about GitFlow by Vincent Driessen, and there are 2 things I'm not sure about:
In the big diagram in the beginning of the article:
In the line of the develop branch, ...
- 162
0
votes
1
answer
220
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 ...
- 162
16
votes
4
answers
6k
views
Why deploy to the development environment?
I can't seem to find a good enough answer, nor can I reason it out myself. Why deploy to the development environment?
In most examples I've seen, automated unit tests and integration tests run as part ...
- 197
-1
votes
2
answers
141
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 ...
- 107
0
votes
2
answers
129
views
What is the best way to organize Hotfixes
I work at a rather small company, around 10 devs and we are facing a lot of problems with merges and so on, I figured it could be because of the amount Hotfixes we are merging into master daily.
So I ...
- 21
0
votes
1
answer
185
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 ...
0
votes
1
answer
360
views
Using tags instead of different branches
Git flow recommends to have separate branches .i.e.
main/master --> production deployable code
Development branch gets created from main/master --> active development branch (integration branch)
...
- 109
-1
votes
1
answer
40
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
3k
views
Why shouldn't I merge two feature branches in git-flow?
When there are two feature branches that has some dependencies, and they are work in progress, but some piece of code want to be shared, why shouldn't I merge a feature into another?
- 127
-2
votes
1
answer
55
views
How to handle dependecies 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
3
votes
2
answers
1k
views
How to deal with multiple release/hotfix branches in Gitflow?
I'm implementing Gitflow at the company I currently work for and everything is going pretty well. I'm just not completely sure if I'm dealing with more than one release on the pipeline at the same ...
68
votes
8
answers
14k
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 ...
- 807
-3
votes
2
answers
202
views
Gitflow, use code from another feature branch in feature branch
me and a friend are working on a project, and we are both doing seperate things (he does UI, I do some data structure), and his code relies on my code. Right now we have a master, a develop and 2 ...
0
votes
5
answers
504
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 ...
- 330
2
votes
2
answers
186
views
Git work flow with pull requests
I have come across a small issue with the git work flow in the team.
When starting to work on a user story, we create a feature branch from the develop branch. Once the user story is finished, a ...
- 129
12
votes
2
answers
2k
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,016
3
votes
3
answers
658
views
Using gitflow, when do people tend to close off the release branch?
We're using the gitflow branching strategy and it works well. What I can't seem to find though is a recommendation on what point people close their releases.
For example, suppose we got 4 ...
- 167
2
votes
1
answer
1k
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 ...
3
votes
1
answer
2k
views
With the "git flow" approach, why are release branches merged into develop?
In the git flow workflow, it is recommended to create branches for releases, and when the release-specific work is done, merge the result into the master and development branch.
I understand why we ...
- 2,368
-1
votes
2
answers
397
views
Git Tagging for SaaS application with CD and SemVer
I'm developing a SaaS application where I'm required to keep track and publish every change in a changelog. I've started to follow a Semantic Versioning approach and also using Continuous Delivery.
...
- 187
-5
votes
2
answers
128
views
How to make my team of developers follow our Git workflow [closed]
We have a team of 6 developers working in multiple technology stack. Most of these developers have little experience 1 - 2 years to be precise.
We are very successful on enforcing coding standards ...
- 107
0
votes
1
answer
879
views
In GitFlow, why not merge from master to feature?
It seems to me that the sooner a developer merges with released code, the better. In the original GitFlow article this isn't done. The original picture is this:
When long lived feature branch on ...
- 850
2
votes
1
answer
721
views
Keeping Feature Branches Clean with Pull Requests to Develop Branch
I'm using GitLab (which calls them merge requests rather than pull requests). From a couple of the comments below it seems like GitLab behaviour may be different from GitHub's.
I'm trying to get my ...
- 427
3
votes
3
answers
527
views
Isn't keeping the master branch intact essential for collaborating?
I've read a lot of useful articles about collaboration with git. Many do's and don'ts, etc. For example, Top ten pull request review mistakes and a nice article about git workflow The Perfect Code ...
1
vote
2
answers
1k
views
Which artifact should I deploy to prod when using Git Flow?
Suppose I have the following series of commits when using Git Flow
We have said that no new features will be included in the next release and have created a release branch (D). QA has started testing ...
- 269
2
votes
3
answers
290
views
Git workflow for demoing features before release
My team and I are looking for a git workflow for demoing experimental changes/features in our web application before they are released. Our audience includes our project manager and designer -- people ...
- 21
4
votes
1
answer
140
views
Git model: branches for features based on master
I organize my Git projects based on the article A successful Git branching model. The problem is that I don't know how to handle the following case:
develop: working on a major app redesign (taking ~...
- 187
0
votes
2
answers
261
views
Need feedback on proposed git flow
We just migrated to git from svn and are trying to define a process that would help us achieve the following:
Deployment to dev env without requiring code review.
Have a pull request / code review ...
- 21
0
votes
1
answer
727
views
How to organize a repository for multi-release multi-client
In our current project we are versioning software using gitflow as process and git/gitlab.
We had some trouble managing multiple release at the same time, but nothing we couldn't survive.
Until now ...
- 217
0
votes
2
answers
202
views
Need a Git branching how-to
Using GitFlow, I created a new class on the develop branch and gave it a property:
Public Class Class1
Public Property Property1 As String
End Class
I committed that change and created a new ...
- 223
2
votes
1
answer
705
views
NuGet versioning with gitflow
Some background information to our actual situation. We are migrating from TFS VC to git. We've a ASP .NET Web API with many different Controller Libraries (>30 assemblies). Many of them are ...
- 31
1
vote
1
answer
275
views
Is infrequent syncing in DVCS trunk based development similar to a long-lived feature branch in GitFlow?
I'm working on a project and trying to understand the differences and trade-offs between variations of trunk based development and feature branching like git flow so I can help implement an ...
- 185
3
votes
3
answers
956
views
How to approach long-lived feature code reviews in trunk based development?
My understanding is that trunk based development should rely on direct commits to master or short-lived feature branches that are merged with master. Incomplete work can be placed inside functions ...
- 185
2
votes
4
answers
2k
views
Git Flow, pull requests, multi-destination branches and conflicts: how is it supposed to work?
I get it for feature branches:
A feature branch is created from develop.
One single PR is then created, going to develop.
If there are conflicts, fix them in the feature branch.
Quite ...
- 610
4
votes
4
answers
3k
views
Managing QA testing when there's pressure to merge things at the earliest possible
I'm working in a team of 12 where we have around 8 developers and a QA. We do not follow a git flow model but we do have feature branches where individual feature developments take place and then ...
- 173
2
votes
3
answers
216
views
Git project organization
My company currently has SVN as main version control and we are in process of migrating to Git. Doing that is a perfect chance to do a structure reorganization.
Before I get to that let me describe ...
- 149
3
votes
3
answers
2k
views
Applying hotfix to intermediate commit on master
Below is the Gitflow workflow followed, where master branch has the commit history(git tag) of different releases.
From release mgmt aspect, we are deleting the release branch after merging with ...
- 2,225
-2
votes
1
answer
473
views
Release pipeline - Which artifact goes in production?
Below is the GitFlow workflow, we are using for a project.
So, in our project master branch currently has only one git commit with just a Readme file. develop branch is forked from that commit. As of ...
- 2,225
3
votes
1
answer
109
views
Git branch management vs deployable environments
I am looking for a git branch management model that would be used easily and would allow for Continuous Integration/Delivery.
Imagine I have 3 environments: prod, uat and dev.
The code repository ...
- 191
0
votes
1
answer
135
views
Do we have distinct type of branches?
There is what we call feature branch in git.
Imagine for example I am making a game and I need to add a Power-up feature.
How I see my commits names with feature branches:
Branch name: Adding Power-...
- 137
0
votes
1
answer
100
views
Knowing what will get released in gitflow
We are a web SaaS company using gitflow and JIRA. As we are 'done' (QA approved) with a feature, we move the story/ticket forward in Jira to a 'done' status. At that point we wait until it gets ...
- 133
7
votes
2
answers
1k
views
Is there a recommended Git branch strategy for two products in the same repo?
My team has a Git repo for a large service that incorporated a related, but fairly unique, micro-service. We recently decided to separate out the micro-service into its own service in terms of release ...
- 423