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.
2
votes
1answer
36 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 ...
0
votes
1answer
49 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 ...
0
votes
1answer
80 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 ...
2
votes
4answers
166 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 ...
1
vote
3answers
154 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 ...
1
vote
2answers
138 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
votes
1answer
83 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
votes
1answer
74 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 ...
2
votes
1answer
95 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-...
-1
votes
1answer
58 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 ...
4
votes
2answers
262 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 ...
4
votes
1answer
554 views
Git Flow w/ VSTS Build Pipelines
I am trying to marry the git flow approach (w/ dev, test, uat, staging, prod env) & automated build and releases in Visual Studio Team System (VSTS). Slightly struggling due to VSTS needing a ...
5
votes
1answer
919 views
Using Gitflow and Semantic Versioning: How to avoid version number conflicts when merging?
I want to use gitflow in combination with semantic versioning. In gitflow, you bump version numbers on every release or hotfix branch. This inevitably leads to version conflicts if a new development ...
5
votes
1answer
181 views
What to do with historical SVN branches after switching to GitFlow?
I am part of a team that has recently moved from an SVN repository to a Git repository, and have started using GitFlow.
As I understand it, this means that in a perfect world, the minimum number of ...
1
vote
1answer
153 views
We're having some deployment issues with Git Flow
We support multiple umbraco websites for a client.
We have our local dev env, staging and live for each of them. Some time ago we started building and deploying all the websites with appveyor.
...
1
vote
1answer
202 views
Avoid or minimize merge conflicts while using NuGet and GitFlow
Here's our problem - we have several solutions with multiple projects using our own nuget packages. We're following GitFlow, but not SemVer. Every time we're developing bigger feature or epic we want ...
2
votes
2answers
82 views
Definition of a feature in GithubFlow model?
I have been using git for a while now primarily on CLi. I am the only person
working on this project so far. I just have 1 master branch and 1 production
branch. The production branch is named such ...
3
votes
1answer
68 views
Finding a balance between deprecating repos and deprecating branches
(This question might be overly broad, and it certainly doesn't have a "right" answer.)
I am rewriting some small embedded projects for a company. Rather than dive into the pre-existing code, I am ...
5
votes
1answer
1k views
Git branch model with QA and branches
We would like to use Driessen's git branch model but we also have QA side. I think I understand how this git flow works but I'm still not sure about testing. For example, I have five new features, ...
5
votes
2answers
124 views
Git workflow for flexible features
I our team we use a gitflow approach to maintain our codebase. But there is one case in which we struggle.
We are in the following case, we have two feature branches (feat/A, feat/B) that were create ...
8
votes
3answers
400 views
Strategy for dealing with A/B tests and Gitflow
I would like to know what strategies do you use to deal with A/B tests of your app and gitflow.
Overview:
We are a team of 6 programmers who develop and maintain a large App. So far we have worked ...
-4
votes
2answers
177 views
How can I control my versioning (perhaps with GIT), such that when I update a function (such as add an argument) it won't break the rest of the code?
I'm just working on a set of MATLAB files right now that I'm using for my thesis. I want to be better organized and figure out the best way to keep track of changes. I have read that GIT is a good ...
0
votes
2answers
175 views
Git workflow for releases
Our product is released every month. I'm looking at popular git flows like the ones in the official git site or Atlassian's. On a high level it is recommended to:
Develop in develop branch
Create a ...
2
votes
2answers
129 views
TFS to Git - repository set up
For various reasons we are looking to move from TFS source control to Git. We're hoping to keep our current workflow but struggling to understand how this translates to Git. In TFS we typically have ...
4
votes
1answer
5k views
rebase your own branch and force push
Is it ok when I do rebase and force push in branch which is used only by me? And will I have a problem after merge this branch in master later?
A few situations to illustrate this:
We have master, ...
0
votes
1answer
273 views
Automated Hotfix Release with Semantic Versioning based off of Master Branch
I have a Python script that lives in my CI pipeline that is responsible for publishing branches and tags, publishing AAR's to our Maven Artifactory, uploading Javadoc, etc.
We used to follow a ...
0
votes
3answers
344 views
Git workflow organisation in small teams
I'm working in a team of about 15 people and we're currently in the process of switching from svn to git and establishing a new workflow with git.
I decided to use gitflow as our new workflow because ...
4
votes
1answer
4k views
How does one name branches that are bug fixes for a release branch in git-flow?
In order to have make sure all code eventually goes through pull request code review, we've started creating branches for features and bug branches off of develop following the git-flow style.
The ...
68
votes
17answers
13k views
What can I do for developers who can't learn Git? [closed]
Context
My team of 8 engineers is currently transitioning to Git (from Subversion) for our next big thing. We have a handful of 'more experienced' engineers that are finding it quite difficult to ...
2
votes
1answer
52 views
Should demo and example apps be included in the same git repo as the project source code?
We have an in house developed and maintained Windows service written in C#. Other people and teams write plugins for this service.
Right now, the git repo for this service includes 3 'demo' apps ...
3
votes
1answer
764 views
use of the master branch in Git branching models
I've seen branching models with a develop and master branch (with features being merged into develop first), where the master branch was always entirely part of the history of develop and would be ...
0
votes
1answer
143 views
Using Git with multiple servers
I want to use a gitflow-like workflow, but with two servers. That is, regular work happens on server A and the release branch is hosted on server B, from where the release tags are created. Commits to ...
11
votes
1answer
7k views
Should a release branch or the master branch be tagged when the gitflow is used?
This issue indicates that:
From my understanding placing the tag on the release branch before
merging (and not on the master branch) is in fact the correct thing to
do so it can be found by git ...
7
votes
3answers
1k views
How to use Git Flow with multiple dependant projects
We are trying to work through an effective branching strategy for our organization so releases, versioning and such are all handled consistently.
We have many C#-based solutions, each with anywhere ...
19
votes
3answers
9k views
Where should QA team do the testing in Gitflow branching model
We are a big team (10-12 developers and 4 qa) working on multiple projects with the same git repository. Its a spring boot based backend web service. We are looking for a good git branching and deploy ...
2
votes
2answers
104 views
is there a way to know the type of web based version control application from a git url?
Background
I'm researching the ability to add some services on top of git web hosts (ie github, gitlab, bitbucket etc, I'm not even sure what they're called, I borrowed that term from the github wiki)...
3
votes
2answers
534 views
does it make sense to create a pull request without code
Background
In our start-ups documentation, we got this:
Difference between a pull request and an issue page
In a nutshell, an
issue page should only include information and discussion about ...
12
votes
1answer
5k views
Where does refactoring belong in GitFlow branch naming model?
I recently started working with GitFlow model as implemented by bitbucket. And there is one thing that is not completely clear to me.
We try to regularly address our technical debt by backlogging, ...
5
votes
2answers
958 views
What is the right process/naming convention with GitFlow to create a subbranch of a feature branch?
I am using GitFlow for my development conventions. Generally speaking, I create a user story and an matching feature branch off my develop branch and work on that. Once the story is complete, the ...
4
votes
5answers
3k views
GitFlow branching strategy, but without the develop branch
I am thinking about adopting something like the GitFlow branching strategy. Instead of using a permanent develop branch, I would like to create a release branch for each sprint (from master) at the ...
10
votes
1answer
836 views
Keeping a clean git history when using gitflow - unmerged commits on develop
Using gitflow, when creating a release-1.0.0 branch and merging it to both master and develop, both branches will have a missing commit:
master wont have the commit where release-1.0.0 was merge to ...
3
votes
2answers
216 views
how to handle small change requests in the automated deployment process
I've setup a Gitlab server to manage several different Laravel Apps. I'm also able to configure the Gitlab CI to deploy the code to the development and production sites. Everything is kind of ...
7
votes
4answers
568 views
What is the “definition” of a finished feature in Gitflow?
This is a Gitflow process question. In all the documentation (and diagrams) I've read about Gitflow, they always indicate that once a feature is completed it is merged back into the develop branch.
...
1
vote
2answers
123 views
Git workflow that allow new hire to work on feature without polluting git history
We want a new hire to work on some features of our current project, however, since he is a new hire, we would like to do code review before he can commit into master branch. Also, we don't want his ...
1
vote
3answers
1k views
Hotfixing with an open release branch while this release is currently tested
We are using gitflow and currently have an open release branch.
The release at A is currently on the test-system to get tested by key-users. In the meantime we need to release an urgent hotfix. ...
0
votes
1answer
270 views
Simpler git-flow model, am I doing it right?
I'm trying to implement a branching model that is similar to git-flow, but simpler (no release or hotfix branches).
The idea is to have the master branch always up to date with the latest tagged ...
1
vote
1answer
251 views
What is the purpose of keeping “open” a merged MR in Gitlab?
In gitlab, there is Merge Requests (MR) like in github there is Pull Requests (PR).
If the MR is rejected, sure, we close it.
But what if the MR is merged ? In that case the button to close the MR ...
20
votes
3answers
2k views
Should I use git stash to save ongoing changes of my project and push it to github to access in other computers?
I very often work on some features of my project that I need to take a break before it is good enough for a commit. However, I use daily two different computers to code (my laptop and my research lab ...
5
votes
2answers
410 views
How do I manage a major overhaul of an open-source project with git?
I have a somewhat popular open-source project on Github, and I'm getting ready to do a major overhaul - completely different directory structure, substantially different versions of major components, ...
0
votes
1answer
309 views
GitFlow, should my release branch include minor version number?
I've found it difficult to find a definitive answer to this question. Using Semantic Versioning and GitFlow should my release branch include the minor version number? I'm not referring to tags.
My ...
