Geek Answers Handbook

Git Retention Strategy Functional branches up to date

I like to constantly update my feature branches. Is there something wrong with what you often do "git merge --no-ff develop". And then at the end, by running the <git function, the termination function is 1 ". These function branches are separated (which means that it is possible that someone else can work on it or that I develop it on my computer at home), mainly because what I like to know is that they are in a different place. If they were not separated, would it be unsatisfactorily optimized?

Or is it better not to update your function branches and just merge everything at the end?

+5
source share
3 answers

If your branches are not public, the best way is to upgrade via rebase. If they are publicly available, it is better to simply combine them at the end (rather than successively changing the changes in them). Both strategies contain a simple, clean commit and a merger history.

+4
source

Yes, I think a consistent reorganization would be the preferred method. And git -flow currently has a team that serves this purpose (not sure whether this team around, when the question was asked) git flow feature rebase <featurename>.

+4
source

More articles:


All Articles