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
57
votes
4 answers

Gitflow: Should I squash commits when merging from a release branch into master?

I am going to merge my release branch to master and I am wondering if I should squash the commits from develop into a single merge commit when merging into master. General documentations about git flow contain figures like this one from in the…
Rika
  • 671
  • 1
  • 5
  • 7
56
votes
3 answers

How to reset the git-flow configuration in SourceTree?

In my team we are migrating from svn to git and we have agreed upon embracing the git-flow flow. I've been playing around a while with SourceTree and the Git-Flow extension. Now, we have decided that the develop branch will be called…
diegomtassis
  • 3,557
  • 2
  • 19
  • 29
56
votes
3 answers

GitFlow: safely merge develop changes to a feature branch

Recently I started working on a big features, so I created a new feature/xyz branch. Problem is that this feature is big, so it will take me ~3 months to complete it. I would like to safely merge progress that has been made in develop to my feature…
Ilija
  • 4,105
  • 4
  • 32
  • 46
55
votes
3 answers

What is the master branch and release branch for?

The "Master branch" is for a product which is ready and can be downloaded by end-users. But there are "release branches" - I have no ideas who these branches are for. Release for customers? For QA? Image showing the branches
newBike
  • 14,385
  • 29
  • 109
  • 192
54
votes
4 answers

git flow - how do I pause development on one feature to work on another

I'm new to git and git flow. I've read all the various pages, blogs, and stackoverflow questions on it,and have been using it in my daily development. But one issue has been bothering me, I just can't wrap my head around it. I know feature branches…
John Green
  • 543
  • 1
  • 4
  • 5
54
votes
3 answers

Branching and merging best practices in Git

We have a developer team of 4 and have recently moved to Git. We want to learn best practices regarding workflow with branching and merging. We are using a lightweight version of Git Flow. We have a dev, staging and a master branch which are all…
Gaui
  • 8,723
  • 16
  • 64
  • 91
52
votes
3 answers

Proper way to use Gitflow with pull requests

I would like to adopt the git-flow tool inside my team. The problem is that "git flow feature finish" merges the branches locally. And I want to create a pull request instead. Thus, the merge will happen in the origin. So, what is the right way to…
utinome
  • 521
  • 1
  • 4
  • 3
46
votes
3 answers

delete a 'feature' branch using gitflow without merging into master branch

I am using the Git GUI called 'Souretree' by Atlassian and in particular the 'Gitflow' module to manage various branches. I just created a 'release' branch that I don't want to merge back into either the master or develop branches. How do I get rid…
johowie
  • 2,475
  • 6
  • 26
  • 42
46
votes
3 answers

Advice on multiple release lines and git-flow, for git non-gurus

Our software product line requires developing and maintaining multiple software versions concurrently. We are relative Git newbies and recently adopted Git Flow to take advantage of Driessen's branching model. We have a very small software team…
mklein9
  • 572
  • 1
  • 5
  • 9
46
votes
3 answers

Does Git flow deletes branch on remote server?

I am using git along with git flow. Here git flow has a develop branch. Whenever i need to start feature i type git flow feature start new a new branch feature/new is created. Then i do the changes and commit them using git push origin…
Paritosh Singh
  • 6,288
  • 5
  • 37
  • 56
45
votes
1 answer

How to do hotfixes with GitHub Pull Requests

Caveat: I am fairly new to both git and GitHub. So, in my current setup, my team uses git flow Hotfixes (usually started and finished by a graphical tool such as GitKraken or IntelliJ) to make changes that have to be merged into two branches and…
Dan
  • 10,990
  • 7
  • 51
  • 80
43
votes
2 answers

why should I delete feature branches when merged to master

Most of the git workflows I've seen suggest to delete a branch after it's been merged into master. For example, this gitflow suggests the following: # Incorporating a finished feature on develop $ git checkout develop Switched to branch 'develop' $…
Max Koretskyi
  • 101,079
  • 60
  • 333
  • 488
43
votes
2 answers

How to undo git flow feature finish?

I am learning git-flow and I just did git flow feature finish , which merged my feature branch to develop and removed it. Instead of this, I want to push the feature branch to github, so I can merge it after a peer review. So the…
hakunin
  • 4,041
  • 6
  • 40
  • 57
42
votes
3 answers

Set the develop branch as the default for a pull request

I want to make the pull request merge into develop from the feature branch by default. I'm advocating the use of git flow, so when a pull request is submitted for a feature, the pull request needs to get merged into develop, and not master. Some of…
ton.yeung
  • 4,793
  • 6
  • 41
  • 72
41
votes
3 answers

Continuous integration and continuous delivery with git-flow

We have been doing continuous integration and continuous delivery since a while with Subversion commits as the pipelines triggers. Recently, we started using git in some projects with git-flow and we are trying to decide which of the branches of…
alejokf
  • 411
  • 1
  • 4
  • 6
1
2
3
…
71 72