Stack Overflow
Stack Overflow

Questions tagged [git-flow]

The git-flow workflow defines a strict branching model designed around a project release. It provides a robust framework for managing larger projects. Use this tag for help with applying git-flow to your workflow, or for help with the supporting scripts (either the original scripts or the AVH Edition).

A workflow and a series of scripts for tagging and branching a development project that uses the Git distributed version control system.

The original scripts have not been updated since 2012. An updated fork of the scripts is git-flow AVH Edition, maintained by Peter van der Does.

1079 questions
39
votes
3 answers

Is it possible to use the git-flow model with Subversion?

We use Subversion and aside from a few individuals such as myself there is little to no experience with branching and merging in Subversion. My Subversion experience is limited to simple feature branches where merge and tree-conflicts, while not…
Ryan Taylor
  • 8,740
  • 15
  • 65
  • 98
37
votes
3 answers

git - confusion over terminology, "theirs" vs "mine"

I'm completely confused about what mine vs theirs means. In this specific case, I've got a feature branch where I just squashed about 80 commits via rebase -i and am merging this back into develop. I got a few conflicts, and I just want to use…
CaptSaltyJack
  • 15,283
  • 17
  • 70
  • 99
36
votes
4 answers

How should I update the version inside my pom.xml when releasing using git flow?

In maven projects the version of a project is contained in the attritbute of the pom.xml file. When creating a new release in the git flow model I need to bumb the version number. This article explains how this is done (without…
yankee
  • 38,872
  • 15
  • 103
  • 162
36
votes
4 answers

Git flow command error: 'flow' is not a git command

I am very new to Git and am starting to learn the command line version. I believe my git flow is not installed correctly. I am running this from a pc. When i run following command: git flow feature start JamesTest I get the following error: git:…
NetSystemAdmin
  • 505
  • 1
  • 6
  • 16
35
votes
3 answers

What is a back-merge

I’ve watched some videos on the git-flow scripts and one term that comes up is “back merge” - e.g. hotfix is merged into master and back merged into develop. I’m assuming back merge is a concept and not a native git command. What exact commands…
mlhDev
  • 2,235
  • 1
  • 22
  • 43
35
votes
3 answers

What is the difference between develop vs. feature branch type?

I read few articles about Git flow best practices. There are many types of git branch (for example: [1], [2]): + Master + Develop + Feature + Bug + Proof of concept + Release + Hotfix What is the difference between types Master vs. Release? What is…
Vy Do
  • 46,709
  • 59
  • 215
  • 313
34
votes
6 answers

GitFlow: merge to master first or after prod release?

Learning GitFlow and I have some concerns that I don't see addressed in any of the docs/articles I've read about it. At some point code on the develop branch needs to be deployed to a QA/staging environment and tested rigorously. So with GitFlow you…
smeeb
  • 27,777
  • 57
  • 250
  • 447
34
votes
3 answers

Git flow branching for fixing a bug

I have been using git flow for a while. I was searching for branching model for fixing issues and bugs found in the develop branch. I know we could use hotfix but it is for master branch, or quick bug fixes for the production. Fixing a bug on…
kriysna
  • 6,118
  • 7
  • 30
  • 30
32
votes
2 answers

How do I use git flow with a staging environment?

We are using git-flow to handle hotfixes & features, with a develop branch & the master branch (for production). What is the easiest way to add a staging branch to the mix so that we can validate work that is on its way to production from develop…
Eric
  • 5,815
  • 3
  • 25
  • 34
32
votes
8 answers

`git flow release finish` non-interactively

How I can use git flow release finish in a manner that doesn't ask for merge commit messages? The -m flag doesn't provide this, as I expected. The goal of course is to be able to script this in such a way that doesn't require interaction.
nicholaides
  • 19,211
  • 12
  • 66
  • 82
31
votes
1 answer

How should Git Flow work with QA testing both a release and a new feature?

We are using Git Flow on our latest iOS project and I am trying to work out a way of working with QA so that they can test the latest release, as well as testing a new feature, without having to worry about which bugs were fixed in which branch. At…
jowie
  • 8,028
  • 8
  • 55
  • 94
31
votes
1 answer

How to resume Git-Flow after a break cause by a merge conflict on a finish command?

Do i really need to complete all the step by hand every time I "Finish" a branch and there is a conflict merging it with Git-Flow? Or there's a way to resume after all the conflict are solved?
JudgeProphet
  • 1,687
  • 3
  • 26
  • 44
30
votes
4 answers

GitFlow: what is difference between release and master branches?

I've just took a look on this gitflow cheat sheet. I don't understand the release branch. Could anybody tell me the difference between release and master branches?
Jordi
  • 20,868
  • 39
  • 149
  • 333
29
votes
1 answer

Structured releases (Git flow) for multiple projects in a single repository (monorepo)

I'm using Git Flow with multiple projects, each with their own repository, successfully. I'm looking to merge these repositories into a single monorepo. The main reason being shared dependent projects across multiple projects, which, currently means…
user1431368
  • 585
  • 8
  • 15
28
votes
4 answers

Who is successfully using git-flow?

Are any large software projects using git-flow and, if so, how is it going? (See http://nvie.com/posts/a-successful-git-branching-model/ and http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/)
Alex
  • 143
  • 2
  • 3
  • 8
1 2
3
…
71 72