I am trying to work with gitflow and A Successful Git Branching Model.
Ones in a while I work on features and finish the feature with
git flow feature finish my-feature
While continuing to work I realize that I have something forget to add to my-feature
Or sometimes I am working on a different feature and want to add something to my-feature
again...
What would be the way to do this?
Is there a way to re-open my-feature
again?
Would I just commit the changes into development?
Or open up another feature?
So in our case, when we "finish" a git flow branch, it makes sense to immediately push the branches + tags to the remote instead of having to enter the git flow commands directly. After entering this config, git flow will automatically push the branches on the remote, thus saving extra time and avoiding confusion.
Use the “git flow release start” command to create the release branch. When the release is stable, run the “git flow release finish” command. $ git flow release finish '0.1.
When a programmer using Gitflow begins a new feature which branch do they create a branch from? In the Git flow development model, you have one main development branch with strict access to it. It's often called the develop branch. Developers create feature branches from this main branch and work on them.
Hotfix branches Maintenance or “hotfix” branches are used to quickly patch production releases. Hotfix branches are a lot like release branches and feature branches except they're based on main instead of develop . This is the only branch that should fork directly off of main .
Using the git-flow principle, i think you should
Create a new feature branch and do the changes. Then merge it back to dev. This is if you are adding a whole new feature.
Use the hotfix branch method. This is if its a minor tweak.
A feature branch deleted should not be recovered under git-flow.
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