On 6/8/12 10:06 PM, Leif Hedstrom wrote:
On 6/8/12 7:30 PM, Bryan Call wrote:
I agree with John, I would rather only have and work on trunk and
then make a branch two weeks before a release.
1. Two weeks before a dev release, we "git rebase" the 3.3.x branch
from master.
Forgot to include before, but remember that the 3.3.x branch (if we used
it) would basically be a time delayed version of trunk. So its history
is (eventually) always going to be the same as master, just (sometimes)
behind and perhaps selective. This is why I feel that we don't need to
branch on every development release, a tag should be just fine. If
people really want to create a git branch for every development release,
we can obviously do so, but please explain / justify :).
The various stable branches still need to exist, since their history can
(and will) be considerably different from "master".
Cheers,
-- Leif
