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.

Filter by
Sorted by
Tagged with
2
votes
1answer
198 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 ...
-3
votes
1answer
46 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. ...
-5
votes
2answers
104 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 ...
-4
votes
1answer
107 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 ...
2
votes
1answer
116 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 ...
2
votes
3answers
389 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
2answers
366 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 ...
2
votes
3answers
176 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 ...
2
votes
1answer
116 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 ~...
0
votes
2answers
142 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 ...
0
votes
1answer
58 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 ...
0
votes
2answers
171 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 ...
1
vote
1answer
263 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 ...
2
votes
1answer
77 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 ...
2
votes
2answers
315 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
3answers
446 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
691 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 ...
2
votes
3answers
185 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
366 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
201 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
83 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
106 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
66 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 ...
6
votes
2answers
586 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 ...
5
votes
1answer
933 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 ...
8
votes
1answer
2k 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
202 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
155 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. ...
2
votes
1answer
336 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
114 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
91 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
3k 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
133 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
521 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
185 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
210 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
149 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 ...
5
votes
1answer
6k 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
324 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
367 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 ...
5
votes
1answer
5k 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
14k 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
1k 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
161 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 ...
16
votes
1answer
11k 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
2k views

How to use Git Flow with multiple dependent 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 ...
23
votes
3answers
14k 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
108 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)...
2
votes
2answers
673 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 ...