Return-Path: 
 <callback-dev-return-8085-apmail-incubator-callback-dev-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-callback-dev-archive@minotaur.apache.org
Delivered-To: apmail-incubator-callback-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 6BDB0CA7D
	for <apmail-incubator-callback-dev-archive@minotaur.apache.org>;
 Thu,  7 Jun 2012 15:16:32 +0000 (UTC)
Received: (qmail 84510 invoked by uid 500); 7 Jun 2012 15:16:32 -0000
Delivered-To: apmail-incubator-callback-dev-archive@incubator.apache.org
Received: (qmail 84472 invoked by uid 500); 7 Jun 2012 15:16:32 -0000
Mailing-List: contact callback-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:callback-dev-help@incubator.apache.org>
List-Unsubscribe: <mailto:callback-dev-unsubscribe@incubator.apache.org>
List-Post: <mailto:callback-dev@incubator.apache.org>
List-Id: <callback-dev.incubator.apache.org>
Reply-To: callback-dev@incubator.apache.org
Delivered-To: mailing list callback-dev@incubator.apache.org
Received: (qmail 84459 invoked by uid 99); 7 Jun 2012 15:16:32 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jun 2012 15:16:31 +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 (nike.apache.org: domain of mikeywbrooks@gmail.com
 designates 209.85.215.47 as permitted sender)
Received: from [209.85.215.47] (HELO mail-lpp01m010-f47.google.com)
 (209.85.215.47)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jun 2012 15:16:25 +0000
Received: by lags15 with SMTP id s15so482061lag.6
        for <callback-dev@incubator.apache.org>;
 Thu, 07 Jun 2012 08:16:04 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=mime-version:sender:in-reply-to:references:date
         :x-google-sender-auth:message-id:subject:from:to:content-type;
        bh=VYVvdnsmuQ2TjpoodEJyvObAIHzZpdec5QT403r7fUc=;
        b=fAvcpmzUQKMWugBMQ5Uzmml8kOx2gsffI9ozEz8d89YFGQ6OLgQfP80YYn4a1THQ2t
         8r4Hf0Cle/AfSI/mS/kKAp6K+mMRE5JzwrLZOXBbHJeWfrFX1t4oDo1wQ8tIeH1YJkQo
         3Pgqzmev7URFZ3B8bSOqthvVbZmn5ZV6XkhzpICQnQXF15x9KE+fjypx5/k8dFyRkB86
         hJ6shfd0QHPV6WHxxgcF8W8QRvN8F6BX8A9lE1vN4gcqmcl6WnmWVORRoC6uxgLzmvyv
         i8+1ArLI6ZqJNbdJUdRG5S3B7T7lPoOU8c03NbWqJBeLZY5f7b6bWtcU9TWgGz7WCMCU
         E/6A==
MIME-Version: 1.0
Received: by 10.152.131.68 with SMTP id ok4mr2895227lab.47.1339082164697; Thu,
 07 Jun 2012 08:16:04 -0700 (PDT)
Sender: mikeywbrooks@gmail.com
Received: by 10.114.25.38 with HTTP; Thu, 7 Jun 2012 08:16:04 -0700 (PDT)
In-Reply-To: 
 <CAOBL_k6e-aedWEskM-vSRY0R0WYfYmLy=Oi0QfFD7HbTAML9cg@mail.gmail.com>
References: 
 <CAOBL_k5R98BnqEC3KH_Kdz4VEDUhJMdA1o_oK_cDseR4b4B-qQ@mail.gmail.com>
	<CAM1AYQDKcqK14rnHv12TduA5AbK+TZ+F1Zs7RZ5NdssRvM9Afg@mail.gmail.com>
	<CAOBL_k6e-aedWEskM-vSRY0R0WYfYmLy=Oi0QfFD7HbTAML9cg@mail.gmail.com>
Date: Thu, 7 Jun 2012 08:16:04 -0700
X-Google-Sender-Auth: tJKzze_868K-fZ7v_lcSkC3TU-8
Message-ID: 
 <CAP7NMPrxRJdCkm6qp4hTvNpJCc7mhkQ70RWWfg08dqeHvdAmwQ@mail.gmail.com>
Subject: Re: [Android] Merging CordovaWebView into Master
From: Michael Brooks <michael@michaelbrooks.ca>
To: callback-dev@incubator.apache.org
Content-Type: multipart/alternative; boundary=f46d0435c1d2c0787004c1e35c2c

--f46d0435c1d2c0787004c1e35c2c
Content-Type: text/plain; charset=ISO-8859-1

You could try [1] :

git merge -s recursive -Xignore-space-change <name of branch to merge>

If the merge goes bad, you can always do a hard reset back to the current
(apache remote) HEAD: git reset --hard <apache remote SHA>

[1]
http://stackoverflow.com/questions/5256769/git-merge-and-fixing-mixed-spaces-and-tabs-with-two-branches

On Thu, Jun 7, 2012 at 7:59 AM, Joe Bowser <bowserj@gmail.com> wrote:

> On Thu, Jun 7, 2012 at 6:31 AM, Simon MacDonald
> <simon.macdonald@gmail.com>wrote:
>
> > Dude, you told me to merge the death to tabs commit so don't complain :)
> >
> >
> It shows that I had a misunderstanding of how Git handles such things.  For
> some reason I didn't think changing tabs to spaces would confuse it and
> cause me to have to walk through the code and redo a merge I already did.
>  I know, totally crazy-talk, right?
>
> (Note: I'm sure there's a setting to get git to ignore whitespace, but I
> have no idea what that is, or whether we want that turned on).
>
>
> > Yes, I think we should tag the head with a non-CordovaWebView tag.
> > Like you said if we need to cut an emergency 1.8.1 release it will be
> > much easier.
> >
> >
> So, I'm going to call the tag 1.8.1-pre, just so it's clear why it exists.
>  Sound good?
>
> Joe
>

--f46d0435c1d2c0787004c1e35c2c--