Return-Path: X-Original-To: apmail-cordova-dev-archive@www.apache.org Delivered-To: apmail-cordova-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 8BCE6E819 for ; Fri, 22 Feb 2013 01:04:28 +0000 (UTC) Received: (qmail 72252 invoked by uid 500); 22 Feb 2013 01:04:28 -0000 Delivered-To: apmail-cordova-dev-archive@cordova.apache.org Received: (qmail 72224 invoked by uid 500); 22 Feb 2013 01:04:28 -0000 Mailing-List: contact dev-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list dev@cordova.apache.org Received: (qmail 72216 invoked by uid 99); 22 Feb 2013 01:04:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Feb 2013 01:04:28 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of mikeywbrooks@gmail.com designates 209.85.212.182 as permitted sender) Received: from [209.85.212.182] (HELO mail-wi0-f182.google.com) (209.85.212.182) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Feb 2013 01:04:22 +0000 Received: by mail-wi0-f182.google.com with SMTP id hi18so143941wib.3 for ; Thu, 21 Feb 2013 17:04:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:content-type; bh=eZNDvYBdLZeorD4M8YanUYSkqNZop99PG3H0Qc8eQcY=; b=F61OhHbvZUuMSxKYcHHSQ4o6kSnGhK6jYlHV/RFn/g2HB30OQJ/FxPTIW2RXEhZdPm ydB1+orJom9wPSwRgs+bJX8RwkHeAlfWINpwXK5Nee1bVcWI2WWiGH2CC8vSsIN76Aak mr0xBfXKcoW7FbT2qdjDb3LyPbPuIEB1FyPYd7xyoUmwGMvEizSNA7S69xJa7EFuQo+Y V8hae6nwVYcQqsOpyYMGSSRkcNh0d5aFxI9+L1uSs1RHSbhZq/pzNbHrOujvYRReIXGb qtdZGPThwPK+X3uoJZmnYxQ2PO60jFYB/Pq6DQqXnSdSo9TmQVYUasLkcXs2/Vxv4wGg iNEw== MIME-Version: 1.0 X-Received: by 10.180.81.42 with SMTP id w10mr135490wix.28.1361495041818; Thu, 21 Feb 2013 17:04:01 -0800 (PST) Sender: mikeywbrooks@gmail.com Received: by 10.216.245.76 with HTTP; Thu, 21 Feb 2013 17:04:01 -0800 (PST) In-Reply-To: References: Date: Thu, 21 Feb 2013 17:04:01 -0800 X-Google-Sender-Auth: Mv0FNP7Jn3Oah_lqjHAxq4zfxqk Message-ID: Subject: Re: docs question: master/next From: Michael Brooks To: dev@cordova.apache.org Content-Type: multipart/alternative; boundary=bcaec555503e54c74c04d645c4e9 X-Virus-Checked: Checked by ClamAV on apache.org --bcaec555503e54c74c04d645c4e9 Content-Type: text/plain; charset=ISO-8859-1 Yea, ideally fast-forward merged to preserve the SHA. If that's not possible, then cherry-picked. On Thu, Feb 21, 2013 at 4:54 PM, Shazron wrote: > Cool - then those two commits should be cherry-picked into next since they > are part of the next release > > > On Thu, Feb 21, 2013 at 4:53 PM, Michael Brooks >wrote: > > > TLDR; Yes > > > > My understanding is that any commits that you want to appear in the > "next" > > release, then put them into next. > > > > All commits into "next" will eventually be merged into "master" as well > for > > the future releases. > > > > Michael > > > > On Thu, Feb 21, 2013 at 4:27 PM, Shazron wrote: > > > > > Should these two commits be in next as well since they are to be > released > > > with 2.5.0? > > > > > > > > > > > > https://git-wip-us.apache.org/repos/asf?p=cordova-docs.git;a=commit;h=d2cce8fdc5d3343702d89868c04805bfc662b1c8 > > > > > > > > > https://git-wip-us.apache.org/repos/asf?p=cordova-docs.git;a=commit;h=b58149ed332ecc14ed46cf73b60734a0e15d1816 > > > > > > --bcaec555503e54c74c04d645c4e9--