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 =======
On Thu, Jan 9, 2014 at 11:12 PM, Mike Tutkowski <mike.tutkow...@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.tutkow...@solidfire.com> wrote: > >> Hi, >> >> I often seem to get weird diff output like the following: >> >> <<<<<<< HEAD >> >> ======= >> >> >> >>>>>>> ecd4a9c... CLOUDSTACK-5823: Taking a VMware snapshot doesn't work >> >> >> Does anyone know why Git doesn't understand here that I just added a new >> line in the more recent version of the file? >> >> >> Thanks! >> >> -- >> *Mike Tutkowski* >> *Senior CloudStack Developer, SolidFire Inc.* >> e: mike.tutkow...@solidfire.com >> o: 303.746.7302 >> Advancing the way the world uses the >> cloud<http://solidfire.com/solution/overview/?video=play> >> *™* >> > > > > -- > *Mike Tutkowski* > *Senior CloudStack Developer, SolidFire Inc.* > e: mike.tutkow...@solidfire.com > o: 303.746.7302 > Advancing the way the world uses the > cloud<http://solidfire.com/solution/overview/?video=play> > *™*
