Menu
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 use the git-flow tool in teams that also work with pull requests?
Tried to google it but could not find something meaningful.
500
The Gitflow Workflow defines a strict branching model designed around the project release. This workflow doesn't add any new concepts or commands beyond what's required for the Feature Branch Workflow. Instead, it assigns very specific roles to different branches and defines how and when they should interact.
You can just use the git flow feature publish <name>this will publish your feature branch to your origin (like Bitbucket). Then you can create the pull request there and merge it into develop. After that is done, you need to manually delete the local feature branch.
The only command you can not use is git flow feature finish <name>. This works fairly well and you can still use most of the git flow helpers.
The same goes for releases. I found this article helpfull: https://blog.axosoft.com/pull-requests-gitflow/
As well as https://community.atlassian.com/t5/Bitbucket-questions/git-flow-feature-finish-and-pull-request/qaq-p/347877
Hope this helps a little. There is just not the one perfect solution to this problem.
188
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
