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
15
votes
1 answer

Git-flow reopening a finished feature

I am trying to work with gitflow and A Successful Git Branching Model. Ones in a while I work on features and finish the feature with git flow feature finish my-feature While continuing to work I realize that I have something forget to add to…
silverfighter
  • 6,762
  • 10
  • 46
  • 73
15
votes
4 answers

Avoiding maven repository version collision when using feature branches

Question: How do you handle feature branches for maven multi project builds? Jenkins builds and deploys these branches to keep build overhead on developers to a minimum but develop and feature branches cannot build the same maven version or we risk…
Peter Kahn
  • 12,364
  • 20
  • 77
  • 135
15
votes
2 answers

Nightly build for release branch if branch exists

I'd like to set up a nightly build for my release branch. Since I'm using git-flow I don't always have a relase branch so I would like it to build it if it can find a branch with a pattern of: refs/heads/release-* Any idea of how to get teamcity to…
slinzerthegod
  • 615
  • 6
  • 17
14
votes
3 answers

Git workflow and Gerrit

I am trying to implement a 'git-flow' kind of workflow using Gerrit but I can't seem to figure out the last piece of the puzzle. There are two preconditions to my problem: Gerrit will only perform merging to one branch I do not allow merge commits…
Ivo
  • 519
  • 2
  • 9
  • 21
14
votes
2 answers

Updating migration timestamps in feature branches

Let's say there's active development in both my main branch (devlop) and my feature branch. Both are adding migrations now and again. Before merging the feature branch into the main branch, I'm going to rebase it onto the main branch. So it only…
John Bachir
  • 22,495
  • 29
  • 154
  • 227
14
votes
4 answers

Gitflow develop branch behind master after a release

We are using Gitflow for our git branch workflow (through TFS). When a release is successful we do the following Pull request from release to master Pull request from release to develop Step 1 creates a commit (Merged PR XXX: Merge release to…
openshac
  • 4,966
  • 5
  • 46
  • 77
14
votes
2 answers

How should gitflow hotfixes work?

We use Gitflow for our web builds, and I have a question about how hotfixes are supposed to work. But first I should explain that we don't quite use the normal Gitflow workflow. I understand that usually you would branch your features, they would…
MattRogowski
  • 726
  • 2
  • 7
  • 22
14
votes
2 answers

Stop git flow from creating a tag automatically

When I found some bugs in my project,I created a hotfix branch: git flow hotfix start fixSomeBug When I did some changes and commits,I wanted to merge these commits to master,so I typed git flow hotfix finish fixSomeBug Next I needed to write…
王如锵
  • 941
  • 7
  • 17
14
votes
1 answer

git subtree merged on root of repository (w. git-flow)

We have a repository, git-flow based, where we added an external library as a subtree (using Atlassian SourceTree's git subtree) on the development branch. Project/ Library/ X/ Y/ Z/ Later we did a git flow release, merging the…
Ramon Poca
  • 1,889
  • 1
  • 10
  • 19
14
votes
2 answers

Using git flow, how would I revert back to a previous release?

I'm using git flow for my projects. When a release has been merged into the master branch it is tagged with the release version (e.g. 1.2.0) and deployed to my production servers. Now I want to quickly revert to the previous release tag (e.g. 1.1.0)…
Kriem
  • 8,666
  • 16
  • 72
  • 120
13
votes
4 answers

SourceTree: How to create multiple hotfix branches with Git Flow

How can I create a second hotfix branch in Sourcetree when one already exists? Whenever I try to it tells me to finish my current hotfix first. Any way to have multiple hotfix branches?
Andrew
  • 18,680
  • 13
  • 103
  • 118
13
votes
4 answers

git-flow: workflow for making "release candidates" / QA web artifacts

We are developing several projects that consist of web artifacts, using the git-flow branching model. Refer to: Vincent Driessen's git flow branching model We are using develop branch and jenkins to auto build and deploy SNAPSHOT web artifacts to…
vikingsteve
  • 38,481
  • 23
  • 112
  • 156
13
votes
2 answers

Sourcetree and GitFlow - not showing color branches

Code base getting large. Decided to get better at GIT... I am using xCode and decided to move away from xcode git and to SourceTree. I am keeping my code local on my machine but would like to get into the git flow habit. I opened Sourcetree and…
Khaled Barazi
  • 8,681
  • 6
  • 42
  • 62
12
votes
5 answers

Development and Production Environments with GitHub flow

At work, we're now using GitHub, and with that GitHub flow. My understanding of GitHub flow is that there is a master branch and feature branches. Unlike git flow, there is no develop branch. This works quite well on projects that we've done, and…
Nathan Sainsbury
  • 383
  • 3
  • 12
12
votes
1 answer

Gitflow with multiple master branches

While this is similar to the thread Git-flow and master with multiple parallel release-branches and to What's best way to work with git on multiple master branch?, it is not quite identical... I did find this one is rather similiar: Multiple…
BuvinJ
  • 10,221
  • 5
  • 83
  • 96
1 2 3
…
71 72