Stack Exchange Network

Stack Exchange network consists of 174 Q&A communities including Stack Overflow, the largest, most trusted online community for developers to learn, share their knowledge, and build their careers.

Visit Stack Exchange

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.

4
votes
2answers
170 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
128 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 ...
4
votes
1answer
175 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
167 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
139 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
104 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
69 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
55 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
601 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
113 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 ...
7
votes
3answers
284 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
164 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
0answers
69 views

Git repo structure for a plugin targeting multiple platform versions

TLDR: looking for git-flow like workflow conventions suited to developing extensions that target multiple versions of the host platform. At our company we develop extensions for a PHP website ...
0
votes
2answers
150 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
107 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 ...
3
votes
1answer
3k 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
217 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
287 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 ...
3
votes
1answer
2k 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
12k 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
51 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
556 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
138 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 ...
9
votes
1answer
4k 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
863 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 ...
15
votes
3answers
5k 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
101 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
466 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 ...
9
votes
1answer
3k 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
665 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 ...
3
votes
5answers
2k 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
726 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
213 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
472 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
115 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
2answers
590 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
264 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
144 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 ...
19
votes
3answers
1k 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
342 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
257 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 ...
17
votes
4answers
8k views

In GitHub flow, is it OK to base feature branch on another feature branch?

We use GitHub Flow in our project and most of the time, we open a new feature branch from master, do some work there, open a PR, review the code and merge back into master. However, my current work ...
1
vote
1answer
326 views

More than one deployable git branch

My dilemma is about the GIT flow. Let's assume that I have an application that can be deployed differently (staging release, QA release, production release). Since the application has profiles to be ...
3
votes
1answer
74 views

Isn't the master branch just a surrogate of tagging in the gitflow model?

Reading the gitflow model, it seems to me that the master branch is there only to provide a branch where to store stable versions. What does that add to just tagging develop with the stable versions?
4
votes
1answer
121 views

Do feature fixes need to be local only?

From this blog post describing the git-flow model, it seems that feature branches have to remain local to the user working on them and are actually deleted right before pushing to origin. This kind ...
6
votes
2answers
8k views

Where do bugfixes go in the git-flow model?

In the, commonly referred to as, Git-flow model hotfixes go in their specific hotfix-* branch and small integration fixes right before release go in the release-* branch. General bugfixes from the ...
4
votes
2answers
352 views

Fork Management of Git Multi-level Hierarchies

We have the following Git hierarchy structure in place, where each child is forked from the parent. If we build something in Client1 that will be useful in the entire hierarchy, what is the best way ...
24
votes
6answers
2k views

How do I approach a complicated merge

Here is the deal, I have joined a new company and have been asked to finish off the work on a branch which hasn't been touched for almost a year. In the meanwhile, the master branch has been growing ...
2
votes
2answers
144 views

Bugs showing up with merge on the release branch

When trying to follow the the gitflow model, we have a branch for the releases. However, we've had complicated merges when trying to merge from develop and bugs have crept in to that branch from this....
6
votes
2answers
2k views

gitflow model with UAT releases is too chaotic, how to simplify?

At $DAYJOB, we have the following release/delivery pipeline: Get new features, work on new features. Once all features are completed, our own QA performs regressions, etc. QA signs off on first UAT ...