branches and tags

[Alex-Jordan]

I'm at a point with ORCCA where we want to get serious about managing editions. My thinking is to start by making a tag for the just-completed "edition gamma" (the third edition from our pilot/construction year; the real "edition 1.0" will be completed in the coming months and released well in time for next fall).

So I'd have a tag "edition-gamma". And there there will be two branches: one for smaller edits that we want to immediately apply to the eBook, and one for larger edits that go into the next edition. The second branch should always get any commits that go into the first branch. Have we settled on standard names for these branches? I'm not sure "master" and "develop" are the right names. Are we going with "master" and "edition"?

[rbeezer]

I haven't heard any objection to "master" plus "edition", and sijnce I suggested edition, I kinda like it. I want to experiment soon with Tom using a branch called "solutions", which *never* gets merged into master, and is kept private. Stay tuned. The second branch should always get any commits that go into the first branch. You mean "master is regularly/routinely merged into edition"? (And only rarely is edition merged into master.)