> I favor the approach that is the least complex/confusing for the most people. I would rather concentrate the complexity/gymnastics on a few people managing branches than expect every developer to grok the issues around releases, maint branches, etc. every time they push a commit. > > So I favor jayg's Option 1. > > s|e +1