Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B71F87342 for ; Thu, 6 Oct 2011 16:43:35 +0000 (UTC) Received: (qmail 99626 invoked by uid 500); 6 Oct 2011 16:43:35 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 99600 invoked by uid 500); 6 Oct 2011 16:43:35 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 99593 invoked by uid 99); 6 Oct 2011 16:43:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Oct 2011 16:43:35 +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; Thu, 06 Oct 2011 16:43:33 +0000 Received: from eos.apache.org (localhost [127.0.0.1]) by eos.apache.org (Postfix) with ESMTP id 7FE5D10D for ; Thu, 6 Oct 2011 16:43:12 +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: Thu, 06 Oct 2011 16:43:12 -0000 Message-ID: <20111006164312.42135.10715@eos.apache.org> Subject: =?utf-8?q?=5BSubversion_Wiki=5D_Trivial_Update_of_=22SimpleAndSafeMerges?= =?utf-8?q?=22_by_JulianFoad?= Auto-Submitted: auto-generated X-Virus-Checked: Checked by ClamAV on apache.org Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" fo= r change notification. The "SimpleAndSafeMerges" page has been changed by JulianFoad: http://wiki.apache.org/subversion/SimpleAndSafeMerges?action=3Ddiff&rev1=3D= 9&rev2=3D10 ''Design notes, plans and ideas by Julian Foad'' = ---- + =3D Guiding Users into Simple and Safe Merging =3D =3D=3D Aim =3D=3D Make it much harder to merge the =E2=80=9CWrong Way=E2=80=9D by accident. =20