cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Mike Tutkowski <mike.tutkow...@solidfire.com>
Subject Weird Diffs Sometimes
Date Fri, 10 Jan 2014 05:57:21 GMT
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.tutkowski@solidfire.com
o: 303.746.7302
Advancing the way the world uses the
cloud<http://solidfire.com/solution/overview/?video=play>
*™*

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message