Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4FA63C2F9 for ; Mon, 7 May 2012 22:50:00 +0000 (UTC) Received: (qmail 59099 invoked by uid 500); 7 May 2012 22:49:59 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 58995 invoked by uid 500); 7 May 2012 22:49:59 -0000 Mailing-List: contact commits-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 commits@couchdb.apache.org Received: (qmail 58988 invoked by uid 500); 7 May 2012 22:49:59 -0000 Delivered-To: apmail-incubator-couchdb-commits@incubator.apache.org Received: (qmail 58984 invoked by uid 99); 7 May 2012 22:49:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 May 2012 22:49:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.131] (HELO eos.apache.org) (140.211.11.131) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 May 2012 22:49:57 +0000 Received: from eos.apache.org (localhost [127.0.0.1]) by eos.apache.org (Postfix) with ESMTP id A7B49F93; Mon, 7 May 2012 22:49:36 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Apache Wiki To: Apache Wiki Date: Mon, 07 May 2012 22:49:36 -0000 Message-ID: <20120507224936.5234.84523@eos.apache.org> Subject: =?utf-8?q?=5BCouchdb_Wiki=5D_Update_of_=22Merge=5FProcedure=22_by_NoahSla?= =?utf-8?q?ter?= Auto-Submitted: auto-generated Dear Wiki user, You have subscribed to a wiki page or wiki category on "Couchdb Wiki" for c= hange notification. The "Merge_Procedure" page has been changed by NoahSlater: http://wiki.apache.org/couchdb/Merge_Procedure?action=3Ddiff&rev1=3D6&rev2= =3D7 = Follow these instructions to merge a feature in to one release branch. = - '''@@ BOB, PLEASE FILL IN A LIST OF INSTRUCTIONS, INCLUDING COPY AND PAST= E GIT COMMANDS, HERE.''' + '''@@ BOB, PLEASE CREATE IN A LIST OF INSTRUCTIONS, INCLUDING COPY AND PA= STE GIT COMMANDS, HERE.''' = =3D=3D Bugfix =3D=3D =20