Software Engineering Stack Exchange
Software Engineering Stack Exchange

Questions tagged [gitflow]

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.

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 haven't been updated in months, a repository with a more active development exists.

143 questions
72
votes
17 answers

What can I do for developers who can't learn Git?

Context My team of 8 engineers is currently transitioning to Git (from Subversion) for our next big thing. We have a handful of 'more experienced' engineers that are finding it quite difficult to pick up Git. I get asked the same trivial questions…
Gusdor
  • 738
  • 1
  • 5
  • 11
69
votes
8 answers

In code review, should I ask to do a refactor outside of the scope in a pull request?

I have been studying the best practices for a code review, and I was wondering what to do in the following scenario: During a code review, I see potential improvements, but decide that they are outside of the scope of the pull request (PR). Should I…
Tisp
  • 817
  • 1
  • 5
  • 7
58
votes
4 answers

What happens if a feature merged into develop is postponed by management?

We recently had a problem whereby a feature for our webapp (automatic signup) was postponed by management because they felt the start was too "cold" but they wanted all the other features we had been working on to go live. The problem is that this…
Calin Leafshade
  • 1,991
  • 2
  • 14
  • 13
49
votes
2 answers

Where does refactoring belong in GitFlow branch naming model?

I recently started working with GitFlow model as implemented by bitbucket. And there is one thing that is not completely clear to me. We try to regularly address our technical debt by backlogging, planning, and implementing the refactoring tasks.…
AMA
  • 592
  • 1
  • 4
  • 8
47
votes
4 answers

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 like "git flow feature finish` I'm confused as…
AdamT
  • 579
  • 1
  • 4
  • 3
40
votes
2 answers

Where should QA team do the testing in Gitflow branching model

We are a big team (10-12 developers and 4 qa) working on multiple projects with the same git repository. Its a spring boot based backend web service. We are looking for a good git branching and deploy strategy. we also have a qa team who ensures…
srini
  • 653
  • 2
  • 6
  • 12
34
votes
4 answers

In GitHub flow, is it OK to base feature branch on another feature branch?

We use GitHub Flow in our project and most of the time, we open a new feature branch from master, do some work there, open a PR, review the code and merge back into master. However, my current work depends on another issue that is being worked on in…
Borek Bernard
  • 1,075
  • 1
  • 11
  • 16
33
votes
3 answers

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 makes it into the branch, but if a critical…
Makoto
  • 837
  • 1
  • 8
  • 14
31
votes
6 answers

How do I approach a complicated merge

Here is the deal, I have joined a new company and have been asked to finish off the work on a branch which hasn't been touched for almost a year. In the meanwhile, the master branch has been growing with a steady pace. Ideally I would like to merge…
Allan Spreys
  • 845
  • 1
  • 8
  • 13
28
votes
3 answers

Where do bugfixes go in the git-flow model?

In the, commonly referred to as, Git-flow model hotfixes go in their specific hotfix-* branch and small integration fixes right before release go in the release-* branch. General bugfixes from the previous version does not seem to have a…
Shoe
  • 681
  • 1
  • 5
  • 15
27
votes
1 answer

Should a release branch or the master branch be tagged when the gitflow is used?

This issue indicates that: From my understanding placing the tag on the release branch before merging (and not on the master branch) is in fact the correct thing to do so it can be found by git describe --tags from the develop branch, too.…
030
  • 508
  • 2
  • 5
  • 17
24
votes
2 answers

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 light for production, we close the branch, by merging…
tommarshall
  • 351
  • 1
  • 2
  • 5
20
votes
6 answers

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 to the huge number of developers, we are trying to…
corgrath
  • 1,327
  • 2
  • 10
  • 11
19
votes
3 answers

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 probably start fixing some things and making some…
Geoff Wright
  • 193
  • 1
  • 1
  • 5
19
votes
3 answers

Should I use git stash to save ongoing changes of my project and push it to github to access in other computers?

I very often work on some features of my project that I need to take a break before it is good enough for a commit. However, I use daily two different computers to code (my laptop and my research lab desktop). E.g.: I am working on a feature at…
Leandro
  • 301
  • 1
  • 5
1
2 3
…
9 10