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 branches, but nothing is said or done about extant feature branches.
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 production issue comes up, we have to ensure that the work somehow makes it into both branches.
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 a workflow step like git flow feature finish (which merges the feature branch into the develop branch), I’m confused as to where the code review actually happens and how git-flow or git can facilitate that review.
Is git-flow in the spirit of git? [closed]
As it currently stands, this question is not a good fit for our Q&A format. We expect answers to be supported by facts, references, or expertise, but this question will likely solicit debate, arguments, polling, or extended discussion. If you feel that this question can be improved and possibly reopened, visit the help center for […]
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.
How Can GitFlow Work for Multi-Product Releases?
I am looking to adopt GitFlow for a multi-product repository. This repo contains multiple on-prem applications and libraries. Due to the nature of the products, releases are not frequent and we do not want to be releasing continuously, so there’s currently no need for continuous deployment.
Branching strategy with two teams with different release cycles
what I have We have two teams with different release cycles. The teams work in the same solution, but don’t change the same files. We have a developer team that uses 2 week sprints and delivers after each sprint. After the sprint is done, they will create a release branch and release to the Test, […]
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 trying to agree on a branching model. Our previous project was based on a non-standard version model that led to issues when managing hot-fixes and patches to existing releases.
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 trying to agree on a branching model. Our previous project was based on a non-standard version model that led to issues when managing hot-fixes and patches to existing releases.
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 trying to agree on a branching model. Our previous project was based on a non-standard version model that led to issues when managing hot-fixes and patches to existing releases.