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.

986 questions
1261
votes
11 answers

Git merge hotfix branch into feature branch

Let’s say we have the following situation in Git: A created repository: mkdir GitTest2 cd GitTest2 git init Some modifications in the master take place and get committed: echo "On Master" > file git commit -a -m "Initial commit" Feature1 branched…
theomega
  • 29,902
  • 21
  • 83
  • 125
1220
votes
10 answers

Create a branch in Git from another branch

I have two branches: master and dev I want to create a "feature branch" from the dev branch. Currently on the branch dev, I do: $ git checkout -b myfeature dev ... (some work) $ git commit -am "blablabla" $ git push origin myfeature But, after…
revohsalf
  • 12,265
  • 3
  • 13
  • 4
137
votes
3 answers

What are the pros and cons of git-flow vs github-flow?

We have recently started to use GitLab. Currently using a "centralized" workflow. We are considering moving to the github-flow but I want to make sure. What are the pros and cons of git-flow vs github-flow?
Paul McKenzie
  • 18,189
  • 23
  • 71
  • 116
136
votes
6 answers

Git branching strategy integated with testing/QA process

Our development team has been using the GitFlow branching strategy and it has been great ! Recently we recruited a couple testers to improve our software quality. The idea is that every feature should be tested/QA by a tester. In the past,…
David Lin
  • 12,681
  • 5
  • 43
  • 41
123
votes
3 answers

Git flow release branches and tags - with or without "v" prefix

I have seen multiple contradicting definitions on various git flow related websites. Is there an official recommendation or single source of truth? Branches: release-1.2.3 or release-v1.2.3 Tags: 1.2.3 or v1.2.3
friederbluemle
  • 22,961
  • 11
  • 88
  • 92
109
votes
4 answers

Following git-flow how should you handle a hotfix of an earlier release?

If you try to follow the git-flow branching model, documented here and with tools here, how should you handle this situation: You have made a 1.0 release and a 2.0 release. Then you need to make a hotfix for 1.0. You create a hotfix branch off the…
Klas Mellbourn
  • 35,589
  • 18
  • 119
  • 143
88
votes
4 answers

Git flow - create feature branch off another feature branch

I having been using git flow for a while now. I am curious to learn about a specific use case. For one of my projects I have a ticket for a new website feature. This ticket depends on many sub-tasks. I would like to create a feature branch for the…
pymarco
  • 6,267
  • 4
  • 25
  • 38
88
votes
3 answers

Trying to understand what Travis CI does and when it should be used

I am very new to Git and I am planning to contribute to some open-source project on GitHub after discovering a small error in it. Upon forking it and fixing the error, I purposed a pull request and I noticed this showing up: Failed — The Travis…
trying to figure it out
  • 983
  • 1
  • 7
  • 6
87
votes
2 answers

Is there a command to undo git flow init?

After git flow init, how to remove git flow model? Even, I removed related config from .git/config file. $ git flow init # force reset $ git flow init -f Already remove below content from .git/config file. [gitflow "branch"] master = master …
payliu
  • 1,842
  • 1
  • 16
  • 12
87
votes
6 answers

Git-flow and master with multiple parallel release-branches

We are trying to adopt the successful Git branching model implemented by git-flow. Now, we are working on at least two release-branches, one for the latest stable release and one for the next ("preview") release. What I don't understand is why all…
Mot
  • 24,166
  • 22
  • 78
  • 117
86
votes
6 answers

Sourcetree - upgraded to latest version, git-flow missing

Hey I just updated Sourcetree on my mac to the latest version (2.2). Where did git-flow go? And how do I re-enable this functionality? I just lost myself without it!
Ryan Kempe
  • 907
  • 1
  • 6
  • 12
73
votes
4 answers

Managing hotfixes when develop branch is very different from master?

I'm using the "Git Flow" branching model, with a master branch and a develop branch. I'm working on a major new release, so my develop branch is wildly different from my master branch. This creates a problem anytime I need to make a hotfix on the…
TaylorOtwell
  • 6,695
  • 6
  • 28
  • 40
72
votes
7 answers

git flow branches have diverged

I'm using the git flow tools and I've gotten myself in a bit of problem. My git branches have diverged. I've read master branch and 'origin/master' have diverged, how to 'undiverge' branches'? and have tried to follow the steps, both attempting to…
Paul Cezanne
  • 8,560
  • 7
  • 55
  • 85
64
votes
3 answers

Is there a command to undo git-flow feature start?

I'm inexperienced with git-flow. Is there a command to undo git-flow feature start?
atian25
  • 3,906
  • 6
  • 32
  • 58
57
votes
1 answer

Gitflow feature vs bugfix branch naming

While using Gitflow, what is the reason for separating branch naming to feature vs bugfix vs hotfix? I.e. why not just, for example, instead of: feature/ bugfix/ hotfix/ Just do: change/ What does separating by feature/bugfix/hotfix buy?
Pavel Chernikov
  • 1,889
  • 1
  • 15
  • 33
1
2 3
…
65 66