Merge a branch with Git Flow keeping the branch still alive

后端 未结 1 1725
灰色年华
灰色年华 2021-02-05 09:44

I\'m starting using git flow and I understand that doing:

git flow feature start my-feature
git flow feature finish my-feature

I create a featu

1条回答
  •  生来不讨喜
    2021-02-05 10:04

    Simply use git flow feature finish -k my-feature

    Reference: https://github.com/nvie/gitflow/wiki/Command-Line-Arguments

    About your second question:

    You normally don't merge feature branches repeatedly into develop. You merge develop into the feature branches (i.e. the other way around) or rebase the feature branches onto the HEAD of develop (recommended). The only time when you merge a feature branch into develop is when you finished the development of the feature.
    If you merge feature branches into develop you completely remove the benefit of having a feature branch and you just could have developed directly on develop.
    If you feel you have the need to merge from a feature branch into develop you most likely made changes that are not directly related to that specific feature and should have been made in develop in the first place.

    0 讨论(0)
提交回复
热议问题