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.

learn more… | top users | synonyms

18
votes
2answers
5k views

Is a merging strategy like Git Flow really an anti-pattern?

My company is using Git, and is using a peculiar branching scheme - work is done in master, and branches are reserved for releases. This works fine, so long as all of the work done in an iteration ...
18
votes
6answers
907 views

Development methodologies when hundred of developers are working on one single solution?

We are an organisation consisting of around 200 developers that are working continuously on one single product (using the revision control Git) which is planned to be released at a certain date. Due ...
15
votes
2answers
3k views

How can one use git-flow effectively on a project in which more than one major version is being maintained?

I've migrated several of my projects over to the git flow work flow, and I'm loving it. However, I haven't found a best practice that keeps things flowing as smoothly when working with a project in ...
11
votes
3answers
4k views

Whats the work flow with 2 people on a project

I come to you as a newbie programmer who's been working on his own project (which is progressing nicely). My co-founder has also been learning how to program and has reached a point where he could ...
9
votes
1answer
4k views

GIT workflow for web development

Long ago the small team of web developer I work with started using git for web development. Back then we just committed to staging or master directly and then merged frequently between the two. It was ...
8
votes
3answers
3k views

code review with git-flow and github

With regular git and github I can do a code review by simply creating a pull request of the feature branch I'm working on to the master branch. How would I do code reviews with git-flow? With workflow ...
7
votes
4answers
816 views

Developers blocked by waiting on code to merge from another branch using GitFlow

Our team just made the switch from FogBugz & Kiln/Mercurial to Jira & Stash/Git. We are using the Git Flow model for branching, adding subtask branches off of feature branches (relating to ...
6
votes
1answer
212 views

Avoiding the Grid of Doomâ„¢ in Git-Flow

My project follows the Git Flow branching model. Development happens on develop, which is merged into master and tagged there for releases. Hotfixes happen in branches branched off the current master. ...
5
votes
1answer
65 views

Introducing Pull Requests for a 2 person team - merge my own requests?

I'm introducing git to a junior team member (a co-op). They are comfortable now with the basics of adding, committing, pushing and pulling. Now I want to introduce them to pull requests and ...
5
votes
1answer
1k views

Obstacles to using Git Flow in Subversion

My team at work is starting a new project, using Subversion as our VCS (you may consider this set in stone for the purpose of this question). We're still in the early stages of the project and are ...
5
votes
1answer
852 views

How should I incorporate a hotfix back into a feature branch using gitflow?

I've started using gitflow for a project, and I have an outstanding feature branch as well as a newly created hotfix. Per the gitflow workflow, the hotfix gets applied to both the master and develop ...
5
votes
1answer
468 views

Which commit to add issue/bug tracking ticket # to

I have been committing changes in git for a project over the last several months. I would like to start integrating Trac into my workflow. Generally, I have the 'git flow' style of git repository. I ...
4
votes
1answer
604 views

Is git-flow in the spirit of git? [closed]

The question is pretty self-explanatory. I've had some experience with git-flow, and not much more true experience with plain git before that. (I was using it more as a backup-provider.) I'm ...
4
votes
1answer
100 views

Merging around 15 small Git repos of non-optional centralized web service components to a single large repo

In a centralized web service we break down the components into various small Git repos by software modules, e.g. authentication module, authorization module, data access module etc. (around 15 repos ...
4
votes
1answer
48 views

Does Changing Author info in git repo affect other contributors?

After contributing some weeks I noticed that the author name in my commits were incorrect. Does changing the git history with author info in the commits create any problems for my fellow contributors? ...
4
votes
1answer
4k views

In git, is it a bad idea to create a tag with the same name as a deleted branch?

I have a project with a git branching model that roughly follows that of nvie's git-flow. Our release branches are named in a SemVer format, e.g. v1.5.2 Once a release branch is given the green ...
4
votes
3answers
127 views

What is the correct way to deal with similar but independent features?

Let's say we have a feature request come in and we begin work on it, which we'll call feature-1. It introduces some new logic to the application, which we'll call logic-A and logic-B. A programmer ...
3
votes
1answer
43 views

Merging from unfinished feature branches and code review

We are using the git flow workflow, and it sometimes happens that we have long-lived feature branches. Of course we can merge from the develop branch into our feature branch, when another feature ...
2
votes
2answers
159 views

Git(flow) workflow for web development

In my (small) company, we are currently thinking about dumping our current versioning system (svn) and release procedures, which are crap TBH, and switching to git. It will mainly be used for one ...
2
votes
1answer
144 views

Git branch model critique: always derive from master

I am currently working on a large project involving at least 3 teams working on separate feature sets in the same codebase versioned on Git. Some features require back-end integration and ...
2
votes
1answer
131 views

forking boilerplates? or simply cloning them?

Using gitlab/github. I created boilerplates for all my projects so I've: wordpress-boilerplate html5-boilerplate laravel-boilerplate ror-boilerplate I'm debating myself if/when starting a new ...
1
vote
1answer
88 views

Why do I have to run git add after making changes?

I started using git when I was studying for small projects and then the workflow was git add file when having made a new file and then git commit -m ... for subsequent changes. Now I'm in a new ...
1
vote
1answer
82 views

Does it make sense to use tag without version numbers?

In our working group we had a discussion on using git tags in our projects. Some people argumented pro tags and some argumented against using tags. The crux is that we are talking about Magento ...
1
vote
2answers
202 views

Finish feature reverted commits from develop

I am using git as a version control system, and using git-flow as the branching model. I started a feature branch some weeks ago in order to maintain the system in a clean state while developping that ...
1
vote
1answer
8k views

SourceTree app, how do I know what is my current branch?

I have branched from my develop branch bugfix/issue2 to work on a bugfix. Now that it's done I want to merge this branch bugfix/issue2 back onto develop but it's asking me if I want to merge into my ...
1
vote
0answers
261 views

GitFlow with TFS 2013, bumping versions

We have TFS 2013 only for version control, Team City for building, a Nuget server and Visual Studio 2013. Little late in the game but we haven't set guidelines for getting code from development into ...
1
vote
1answer
174 views

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 ...
0
votes
1answer
52 views

Average commits per merge to Master using gitflow [closed]

I'm currently working alone on a project, but I still use Git since it is a really powerful tool. I use gitflow workflow methodology, and today I have merged to master with 77 commits. I was surprised ...
0
votes
1answer
539 views

In Git, is the use of a 'PRODUCTION' branch necessary and/or would it be feasible to have more than one of them?

A short summary of how we do branch managing: From the MASTER branch one or many feature branches can be made (for mid to long term development), when deploy-able changes have been merged to MASTER ...
0
votes
1answer
479 views

Where does the git flow release message go? [closed]

When creating a release with git flow like: git flow release finish <branch_name> I'm prompted for a release message. I grepped around to see where this go, but no succes. Any idea?
-1
votes
1answer
123 views

A good workflow to start with Continuous Delivery?

My team is facing a couple of new challanges in the near future, as we will start developing a couple of (micro)services which will run in a cloud environment. Therefore we want to establish a ...