[Zlib-devel] zlib 1.2.5.1 baseline

[Jonathan Nieder]

Mark Adler wrote:
> On Sep 18, 2011, at 12:19 PM, Maarten Bosmans wrote:

>> The standard workflow for git has master as the branch which contains
>> the latest development code.
>
> Um, ok.  I was trying to follow what I read in the Pro Git book, which is the
> opposite of what you say:

They're consistent.  The Pro Git book suggests that the master branch
contains "only code that has been or will be released" --- I think
your "develop" branch is intended to meet that description.

The only constant that seems to be consistent between projects is that
the "master" branch contains code that should be the default for
people to test and develop against.  In addition to master, one
sometimes finds

 - "maint" or "urgent" - a fixes-only branch for some previous release
 - "next" - changes that are being tested for stability for master
 - "proposed-updates" - changes under consideration that have not been
   confirmed to be a good idea
 - branches named after topics

The gitworkflows page[*] talks a little about how branches for various
purposes can be used in practice.  (Personally, I'm happy as long as
patches accepted for the next release and their rationales are
available somewhere public, and everything beyond that seems like
nitpicking.)

Hope that helps, and sorry for the ramble.
Jonathan

[*] http://repo.or.cz/w/git.git/blob_plain/html:/gitworkflows.html