Pergunta

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?

Foi útil?

Solução

Using the git-flow principle, i think you should

  1. 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.

  2. Use the hotfix branch method. This is if its a minor tweak.

A feature branch deleted should not be recovered under git-flow.

Licenciado em: CC-BY-SA com atribuição
Não afiliado a StackOverflow
scroll top