From: David Ripton <dripton@ripton.net>
To: Bradley Wagner <bradley.wagner@hannonhill.com>
Cc: git@vger.kernel.org
Subject: Re: With feature branches, what is ever committed directly to master
Date: Tue, 10 Aug 2010 21:05:36 -0400 [thread overview]
Message-ID: <4C61F760.4050409@ripton.net> (raw)
In-Reply-To: <AANLkTin0VgH8CvnUn_tCJPTkhh7Ce-tYWo52qouoVvRN@mail.gmail.com>
On 08/10/10 15:02, Bradley Wagner wrote:
> I realize there are a lot of different Git workflows but I'm wondering
> how others in this community do it.
>
> We're using our "master" branch from our central repo (Beanstalk) as a
> dev branch and we have stable branches for various release versions of
> our software.
>
> We've not made as heavy use of feature branches yet as we should have.
> Once we do start using them more regularly, what kind of stuff is ever
> committed directly to "master" or is master typically the place where
> things are merged into from other stable/features branches?
>
> Is "master" really even unstable at that point?
If your repo is accessible to the public then I think it makes sense to
have master be stable. Because that's what people will see by default
if they clone your repo, and you want to make a good first impression.
If it's a private repo that only insiders are allowed to see, then it
doesn't matter as much.
Our team uses unstable master, which anyone on the team can push to. If
someone pushes to it then a build and tests automatically run, and if
they succeed then that commit gets automatically pushed to the stable
branch. We let anyone create shared branches on the server if they want
to collaborate on a feature. We make a tag for each release, but we
don't make a maintenance branch until we actually need it.
--
David Ripton dripton@ripton.net
next prev parent reply other threads:[~2010-08-11 1:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-10 19:02 With feature branches, what is ever committed directly to master Bradley Wagner
2010-08-10 19:15 ` Michael Witten
2010-08-11 1:05 ` David Ripton [this message]
2010-08-11 3:02 ` Jon Seymour
2010-08-13 22:19 ` Steven E. Harris
2010-08-13 23:52 ` Jon Seymour
2010-08-11 6:57 ` Magnus Bäck
2010-08-11 9:21 ` Jon Seymour
2010-08-11 14:48 ` Tim Visher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C61F760.4050409@ripton.net \
--to=dripton@ripton.net \
--cc=bradley.wagner@hannonhill.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).