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 54DA110EBA for ; Tue, 4 Jun 2013 18:03:43 +0000 (UTC) Received: (qmail 36806 invoked by uid 500); 4 Jun 2013 18:03:42 -0000 Delivered-To: apmail-couchdb-dev-archive@couchdb.apache.org Received: (qmail 36731 invoked by uid 500); 4 Jun 2013 18:03:42 -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 36722 invoked by uid 99); 4 Jun 2013 18:03:41 -0000 Received: from minotaur.apache.org (HELO minotaur.apache.org) (140.211.11.9) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jun 2013 18:03:41 +0000 Received: from localhost (HELO mail-la0-f43.google.com) (127.0.0.1) (smtp-auth username rnewson, mechanism plain) by minotaur.apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jun 2013 18:03:40 +0000 Received: by mail-la0-f43.google.com with SMTP id gw10so552027lab.2 for ; Tue, 04 Jun 2013 11:03:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=1U61OeyCfaBXjFVnrj/e3Fuk1ER4FzRCNrlApEj4Cos=; b=OoQSymdKUsDIh7DKCKbgBGHBU/xIfRh80iNz0rTVyWgQwM5XMoRuyiA2agY30XV6y4 KKH7u3F98UerOxq8uWrsfDyimDn9kTapwQLYCf4EbNc3Zt0pADXSiZJ8h2IUS0XPiPJt SFa+g5pfk5yqCQ2OvcfmlEHJe3UmAURtAJjbNbnTI7EwU2wEr2VeUPqde7vu2z3Q6QOH CWfE3ApziUotszNE0uivNx12+xdaprtqJDedQZTeKs7qROh52s1IM2i5NcXHdWp596Ym bTDmQ+9+gfg+ljnY4XNN6ZXqbvwmIbLmrxvi+Cg8NJWnMBCV7jzCb/xQ1hEWx14sCu8+ fzmw== MIME-Version: 1.0 X-Received: by 10.112.131.129 with SMTP id om1mr12992711lbb.45.1370369018957; Tue, 04 Jun 2013 11:03:38 -0700 (PDT) Received: by 10.112.148.137 with HTTP; Tue, 4 Jun 2013 11:03:38 -0700 (PDT) In-Reply-To: References: <51A8C604.3000104@apache.org> Date: Tue, 4 Jun 2013 19:03:38 +0100 Message-ID: Subject: Re: [REQUEST] Update on using git From: Robert Newson To: "dev@couchdb.apache.org" Content-Type: text/plain; charset=ISO-8859-1 Heh, if I felt I could conclude that thread I would have done so already. We had a reasonably well described approach at one point and coherency was destroyed by a late appearance of the git-flow alternative. B. On 4 June 2013 18:43, Noah Slater wrote: > This thread is concluded. :) I meant the "[DISCUSS] Git workflow" thread. > > > On 4 June 2013 18:41, Robert Newson wrote: > >> What's not concluded in this thread? >> >> B. >> >> >> On 4 June 2013 18:04, Noah Slater wrote: >> > Bob, are you able to help drive the Git thread to conclusion? We need to >> > clarify this and document it. Think a lot people are confused right now >> > since it seems everything is in the air. >> > >> > >> > On 31 May 2013 16:51, Robert Newson wrote: >> > >> >> master, as usual, and the x.y.z branches (for backports). All other >> >> branches should be feature or fix branches we've not deleted. >> >> >> >> B. >> >> >> >> On 31 May 2013 16:47, Wendall Cada wrote: >> >> > I'm fairly well versed in using git and different workflows, rebase, >> etc. >> >> > However, I'm utterly confused as to how I might contribute changes to >> >> > couchdb, what branches are relevant, etc. Is there documentation for >> >> this, >> >> > or a clear summary of decisions made? >> >> > >> >> > Thanks, >> >> > >> >> > Wendall >> >> >> > >> > >> > >> > -- >> > NS >> > > > > -- > NS