git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tim Visher <tim.visher@gmail.com>
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: Wed, 11 Aug 2010 10:48:42 -0400	[thread overview]
Message-ID: <AANLkTik0kvKbe8xQksOrVVs6BygoPF7K_sZJA6BXwRVK@mail.gmail.com> (raw)
In-Reply-To: <AANLkTin0VgH8CvnUn_tCJPTkhh7Ce-tYWo52qouoVvRN@mail.gmail.com>

On Tue, Aug 10, 2010 at 3:02 PM, Bradley Wagner
<bradley.wagner@hannonhill.com> 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?
>
> Thanks in advance! I realize this question is pretty open-ended.

Since no one mentioned it yet, I found this [paper][] to be an
incredible resource and it's the workflow my team has adopted.

[paper]: http://nvie.com/git-model

-- 

In Christ,

Timmy V.

http://blog.twonegatives.com/
http://five.sentenc.es/ - Spend less time on e-mail

      parent reply	other threads:[~2010-08-11 14:49 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
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 [this message]

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=AANLkTik0kvKbe8xQksOrVVs6BygoPF7K_sZJA6BXwRVK@mail.gmail.com \
    --to=tim.visher@gmail.com \
    --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.
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 NNTP newsgroup(s).