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
27
votes
2 answers

Maven: Bind plugin execution to the execution of another plugin, not to a lifecycle phase

Note regarding the accepted answer: I accepted the answer because of strong circumstantial evidence. Nonetheless, this is circumstantial evidence, so take it with a grain of salt. How can I have a plugin be triggered when the user runs a plugin…
Mihai Danila
  • 2,229
  • 1
  • 23
  • 28
25
votes
3 answers

Git-flow fails with "fatal: no tag message? / Tagging failed. Please run finish again to retry"

I am using git-flow to manage a project. I am getting the following message when issuing git flow release finish foo: fatal: no tag message? Tagging failed. Please run finish again to retry. Here is the sequence of steps to reproduce, with a…
CuriousYogurt
  • 836
  • 2
  • 12
  • 18
25
votes
2 answers

Github Protected Branches with GitFlow

I've got a repository with my develop branch protected and I'm using the GitFlow branching model. There's two branches; develop (containing features currently being developed) and master (latest deployed production code). My develop branch prevents…
Mark Walsh
  • 3,241
  • 1
  • 24
  • 46
25
votes
3 answers

Rename a branch in git flow

Is it possible to rename a feature branch using git-flow? I tried looking up git flow help and git flow feature help, and also the git-flow cheatsheet, but couldn't anything. Alternatively, is it safe to just use git branch -m feature/new_name?
Andrew Grimm
  • 78,473
  • 57
  • 200
  • 338
24
votes
2 answers

Using git-flow in a multi-stage deployment

Drawing a blank with finalizing my deploy scheme here. After posting this question: Migrating a production site with no VCS at all to Git, I've got the gist of deploying to a local repo down. My local development server has a git-flow repository on…
James
  • 559
  • 6
  • 17
23
votes
5 answers

What is a good git workflow for TDD?

I quite like Gitflow branching model but I'm not sure where to put the TDD cycle - should I simply use a feature branch and commit everytime I either wrote or passed a test (plus after refactoring)? Create a sub-branch and merge "finished" units…
Tobias Kienzler
  • 25,759
  • 22
  • 127
  • 221
22
votes
4 answers

Multiple development branches with git-flow

I am currently looking a lot into git-flow, and trying to figure out, how to use it for the projects I am involved on. I have looked at the various git-flow tutorials and I am fairly familiar with git. Hence I do not need any tips on git alone, but…
LiKao
  • 10,408
  • 6
  • 53
  • 91
22
votes
3 answers

Maven versioning in GitFlow

Git Flow has been around for a long time and lots of people seem to be adopting it for as their favourite git workflow. When it comes down to implementing Git Flow in a Java / Maven setting, I was wondering how one should approach versioning the…
ddewaele
  • 22,363
  • 10
  • 69
  • 82
22
votes
2 answers

How to install GitFlow for Windows

Is there a way to install Git Flow on Windows? I tried this tutorial but I'm unable to understand it. I already have Git Installed on my PC, can I use GitFlow from my current Git installation?
Saad Qureshi
  • 728
  • 2
  • 7
  • 21
21
votes
7 answers

Is there any IDE/GUI support for git-flow on Windows/Linux?

Are there any GUI frontends for Git with git-flow support? Our team uses Eclipse IDE on Windows and Linux. Managed to gradually infect them with git-svn, now looking for the next steps to harness the power of real branching (rather than…
inger
  • 19,574
  • 9
  • 49
  • 54
21
votes
1 answer

How can I recover mistakes in git flow init?

I've run git init and made a mistake selecting the first branch. Now I want to rerun it to change the settings, but it never asks the first question again. Which branch should be used for bringing forth production releases? - develop Branch…
iwein
  • 25,788
  • 10
  • 70
  • 111
21
votes
1 answer

Adapting the git-flow model for pre-production environments

I am thinking of extending the git-flow model for my current workplace, due to a particular scenario. But my scenario is so common that I'm surprised no-one's done this before with the git-flow model, and this makes me think I've missed an obvious…
Nik Silver
  • 364
  • 1
  • 2
  • 10
21
votes
1 answer

Merge a branch with Git Flow keeping the branch still alive

I'm starting using git flow and I understand that doing: git flow feature start my-feature git flow feature finish my-feature I create a feature and then, when i've finished my changes, I merge it with the develop branch. The finish flow command…
Stefano Ortisi
  • 5,288
  • 3
  • 33
  • 41
21
votes
2 answers

Finishing a feature branch with GIT Flow

From my understanding one of the advantages of creating feature branches is so that you can easily see where large groups of commits have been merged into the develop branch. Upon finishing a feature branch the recommendation is to delete the…
Lea Hayes
  • 62,536
  • 16
  • 62
  • 111
21
votes
2 answers

How to push the "develop" branch to the remote "origin"?

When I do git flow init it creates a master and develop branches. When I add the remote I do git remote add origin git@github.com:NewB/our-repo.git. Now I have git flow initialized on my local repo and I have the remote repo added. After I do git…
AdamT
  • 6,405
  • 10
  • 49
  • 75
1 2 3
…
71 72