From: Stefan F. <ste...@we...> - 2011-10-10 18:11:59
|
> > It's far more important to me that each release is accessible from the > repo. How it achieves that is totally negotiable. > > Personally, because you and Erik are far more active in the project > than I am, I'm willing to give your preferences a bit more weight than > mine. ;-) > > IMO, it's easier to leave master as the lineage of stable changes and > do any new development in (usually local) branches that can be merged > into the stable trunk when they're ready. > > In git, branches and tags are both very very cheap (and fast), unlike > SVN. So, if you want to have all development happen in master, then > branch off for stable releases, we can do that too. I understood that for Erik the latter is the preferred choice. And I do not mind to manually pick the fixes into a separate branch at the time of release. So everyone can contribute simply to the master and does not have to care if where to push depending if it is a bug-fix or a new development. The only thing to ensure is that the master branch compiles and runs after each commit. Substantial changes have still should be done inside separate branches, like my start of refactoring some parts in the Rails 2.0 branch. Stefan |