Return-Path: X-Original-To: apmail-couchdb-dev-archive@www.apache.org Delivered-To: apmail-couchdb-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 709D6D7F2 for ; Fri, 2 Nov 2012 00:55:18 +0000 (UTC) Received: (qmail 85082 invoked by uid 500); 2 Nov 2012 00:55:18 -0000 Delivered-To: apmail-couchdb-dev-archive@couchdb.apache.org Received: (qmail 85050 invoked by uid 500); 2 Nov 2012 00:55:17 -0000 Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list dev@couchdb.apache.org Received: (qmail 85041 invoked by uid 99); 2 Nov 2012 00:55:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Nov 2012 00:55:17 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of wickedgrey@gmail.com designates 209.85.212.176 as permitted sender) Received: from [209.85.212.176] (HELO mail-wi0-f176.google.com) (209.85.212.176) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Nov 2012 00:55:13 +0000 Received: by mail-wi0-f176.google.com with SMTP id hn14so656546wib.5 for ; Thu, 01 Nov 2012 17:54:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=u5ub665bMFy3OmOKaaVFi8UG2LCE7rt4csZ/2UOX1dI=; b=03UTM3rAJVYmHzkU9Dhurbk9J6Sjm+TyhMEKCbnWs8GBASU5Dg+BUhU22wlk7ysY0N XgXQMCR6ICaGoGRpbPpnEzs01eYfrWXwNl67x9gg+ZqOdv55gLUjuT8WfpI77jQe/qL1 ZBB2nMmceTcTNurMPK700vA8IFWPH6tbu4Pt2Elgz0PUo6MQQ8ntQE0eTXH5Grwg7OHn Ui3cU+tk78hVxCGH3aCvZ+pmZ4IcvhR85WPZyk4uY9vFoXx17/CSstGqgVtRxG/7Rde9 72K+552z2NO/DQA87QQXCG1wCf9AbCYEVexYqLzTYOqQMaQ+JRioJrZ2UG8wz3m2wuIp B1Cg== MIME-Version: 1.0 Received: by 10.180.99.194 with SMTP id es2mr226066wib.15.1351817691884; Thu, 01 Nov 2012 17:54:51 -0700 (PDT) Received: by 10.227.38.32 with HTTP; Thu, 1 Nov 2012 17:54:51 -0700 (PDT) In-Reply-To: References: <7D76050A-3095-46A3-81EA-2DB30E78E263@apache.org> <87B791B0-2812-41FB-A91B-E005EB785D9B@apache.org> Date: Thu, 1 Nov 2012 20:54:51 -0400 Message-ID: Subject: Re: branching in couchdb From: "Eli Stevens (Gmail)" To: dev@couchdb.apache.org Content-Type: text/plain; charset=ISO-8859-1 X-Virus-Checked: Checked by ClamAV on apache.org Are the committers familiar with git-flow? http://nvie.com/posts/a-successful-git-branching-model/ https://github.com/nvie/gitflow Having used it at work for closed-source projects, I recommend it as the script support is nice, and it provides a decent branching model that "just works." While we don't use github's automatic merges, it does play nicely with the github pull request system (perhaps less relevant for an apache project). I don't see any reason why it wouldn't work just as well for open source projects. Cheers, Eli