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> *™*
