Return-Path: X-Original-To: apmail-incubator-flex-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-flex-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 045EBD0D1 for ; Wed, 8 Aug 2012 22:59:08 +0000 (UTC) Received: (qmail 48372 invoked by uid 500); 8 Aug 2012 22:59:07 -0000 Delivered-To: apmail-incubator-flex-dev-archive@incubator.apache.org Received: (qmail 48340 invoked by uid 500); 8 Aug 2012 22:59:07 -0000 Mailing-List: contact flex-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: flex-dev@incubator.apache.org Delivered-To: mailing list flex-dev@incubator.apache.org Received: (qmail 48201 invoked by uid 99); 8 Aug 2012 22:59:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Aug 2012 22:59:06 +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 joaopedromartinsfernandes@gmail.com designates 74.125.82.43 as permitted sender) Received: from [74.125.82.43] (HELO mail-wg0-f43.google.com) (74.125.82.43) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Aug 2012 22:59:00 +0000 Received: by wgbdr1 with SMTP id dr1so1011499wgb.0 for ; Wed, 08 Aug 2012 15:58:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :content-type; bh=uvgNijgJqgvVpsFT/ytoFr2vrYlWKWT0GU6EDsKCGiw=; b=MH/tbcOzAeM9MJWlNewsHHq3Fi2a8N8fOwI2vl7WcV6cN4HIKyuw/ax5LqHQpcEjWJ 0WeGuzEq5ZI6ZZNbaNEwwtYldaDz3WTSq8fXV/u2hz0pSmgS+owQXmWUbfZXmK5KfNt0 +T4PlUHECqhAU8XdWj2hELKL/LVXftZ7HjXQxdgIOaWYG26a66XHLpanb+Xii9kkzS0B ZmPJMVNzuh4/Qaz58QdwIWVLYdRdo2q7V4pl36y7wl7sTLmtoUYdp8a5PoR3pHIKBhJ9 fN8kgvYp5KMNXT+h1A7tN3PXtlXjc44aL6CM6fe+Uumi5M76yQeLNEvKXpeYcWii4NxH 0LLg== Received: by 10.180.97.135 with SMTP id ea7mr1518171wib.11.1344466719362; Wed, 08 Aug 2012 15:58:39 -0700 (PDT) MIME-Version: 1.0 Received: by 10.217.4.132 with HTTP; Wed, 8 Aug 2012 15:58:19 -0700 (PDT) In-Reply-To: References: From: =?ISO-8859-1?Q?Jo=E3o_Fernandes?= Date: Wed, 8 Aug 2012 23:58:19 +0100 Message-ID: Subject: Re: How to Merge Unstable Branch (was: [POLL] Use Unstable Branch) To: flex-dev@incubator.apache.org Content-Type: multipart/alternative; boundary=f46d043bdb4e384cc404c6c90d48 X-Virus-Checked: Checked by ClamAV on apache.org --f46d043bdb4e384cc404c6c90d48 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable For those using eclipse, has anyone ever tried CollabNet eclipse plugin? It's from the same guys that created subclipse. Their interface makes all this merge process smoother and can even prevent you from merging if you don't follow SVN best practices. Regarding merging between different branches, it allows to pick which which commit you plan to merge if you don't want to merge all. Jo=E3o Fernandes --f46d043bdb4e384cc404c6c90d48--