But i like to keep my master clean. This allows all Behat users to securely clone/submodule from it, keeping in mind, that it's stable. And if they want latest unstable - they can pull develop branch. And all hot-fixes from master gets automerged to develop if you use `git-flow` tool, so you don't miss anything!
It's just another branching model. It's not bad, it's simply another ;-) 2010/10/29 Michał Piotrowski <[email protected]> > 2010/10/29 Konstantin Kudryashov <[email protected]>: > > Correct! But in this case, you still developing in branches, not in > master, > > as you said in first message ;-) > > Hmm... I think I not told clearly enough what I meant. If you take a > look at schema on this page > http://nvie.com/posts/a-successful-git-branching-model/ > you will find 5 branches. > > All things are merged to devel branch. Main development should be in > master branch. > > If someone forks a tree to develop a new feature he creates his > feature branch - and this branch should be pulled to master branch in > master repo. > > All bugs should be fixed in (pulled to) master branch and then cherry > picked to release branch - if you create release branch and then > hot-fixes IMHO it's the best way to lost important fix. > > Best regards, > Michal > > -- > If you want to report a vulnerability issue on symfony, please send it to > security at symfony-project.com > > You received this message because you are subscribed to the Google > Groups "symfony developers" group. > To post to this group, send email to [email protected] > To unsubscribe from this group, send email to > [email protected]<symfony-devs%[email protected]> > For more options, visit this group at > http://groups.google.com/group/symfony-devs?hl=en > -- If you want to report a vulnerability issue on symfony, please send it to security at symfony-project.com You received this message because you are subscribed to the Google Groups "symfony developers" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/symfony-devs?hl=en
