Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cloudstack.apache.org
Received-SPF: pass (athena.apache.org: domain of mike.tutkowski@solidfire.com
 designates 209.85.219.46 as permitted sender)
MIME-Version: 1.0
In-Reply-To: 
 <CALFpzo6qm7HCTbhc52g2uaArKj_idLgfFHaNjjxLJQA6WhRLMA@mail.gmail.com>
References: 
 <CACOnxCiEUzN97nPETsHohEcbo3XZ1xj4egwzQFGh7tOk_WAP2Q@mail.gmail.com>
	<CACOnxCg2PJ=x=4S40f=9Ve6PdHdRzbZ_n2c8R1Wb4x1g=Fh2qg@mail.gmail.com>
	<CALFpzo6qm7HCTbhc52g2uaArKj_idLgfFHaNjjxLJQA6WhRLMA@mail.gmail.com>
Date: Thu, 9 Jan 2014 23:28:55 -0700
Message-ID: 
 <CACOnxCh_-yi8PDVEKVhSGYNbnjdx4uSc0Ez=vMknADcAL2-NxA@mail.gmail.com>
Subject: Re: Weird Diffs Sometimes
From: Mike Tutkowski <mike.tutkowski@solidfire.com>
To: "dev@cloudstack.apache.org" <dev@cloudstack.apache.org>
Content-Type: multipart/alternative; boundary=001a11c2aa6a2d02a904ef97d7ae

--001a11c2aa6a2d02a904ef97d7ae
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: quoted-printable

Yeah, I guess what I'm wondering about is just why some very complex
changes get auto merged perfectly, but then silly issues like I added a
line in between two statements don't.


On Thu, Jan 9, 2014 at 11:26 PM, Marcus Sorensen <shadowsor@gmail.com>wrote=
:

> Master recently underwent all of the styling changes (deleting
> whitespace, etc), and as such there's a lot that doesn't merge cleanly
> via cherry-pick between 4.4 and 4.3. I'm not sure if that's what
> you're referring to. The output shows you the conflict, one version
> and the other, split by the =3D=3D=3D=3D=3D=3D=3D
>
> On Thu, Jan 9, 2014 at 11:12 PM, Mike Tutkowski
> <mike.tutkowski@solidfire.com> wrote:
> > In other words, I'm wondering why this kind of change doesn't just get
> auto
> > merged.
> >
> >
> > On Thu, Jan 9, 2014 at 10:57 PM, Mike Tutkowski <
> > mike.tutkowski@solidfire.com> wrote:
> >
> >> Hi,
> >>
> >> I often seem to get weird diff output like the following:
> >>
> >> <<<<<<< HEAD
> >>
> >> =3D=3D=3D=3D=3D=3D=3D
> >>
> >>
> >> >>>>>>> ecd4a9c... CLOUDSTACK-5823: Taking a VMware snapshot doesn't
> work
> >>
> >>
> >> Does anyone know why Git doesn't understand here that I just added a n=
ew
> >> line in the more recent version of the file?
> >>
> >>
> >> Thanks!
> >>
> >> --
> >> *Mike Tutkowski*
> >> *Senior CloudStack Developer, SolidFire Inc.*
> >> e: mike.tutkowski@solidfire.com
> >> o: 303.746.7302
> >> Advancing the way the world uses the cloud<
> http://solidfire.com/solution/overview/?video=3Dplay>
> >> *=99*
> >>
> >
> >
> >
> > --
> > *Mike Tutkowski*
> > *Senior CloudStack Developer, SolidFire Inc.*
> > e: mike.tutkowski@solidfire.com
> > o: 303.746.7302
> > Advancing the way the world uses the
> > cloud<http://solidfire.com/solution/overview/?video=3Dplay>
> > *=99*
>


--=20
*Mike Tutkowski*
*Senior CloudStack Developer, SolidFire Inc.*
e: mike.tutkowski@solidfire.com
o: 303.746.7302
Advancing the way the world uses the
cloud<http://solidfire.com/solution/overview/?video=3Dplay>
*=99*

--001a11c2aa6a2d02a904ef97d7ae--