It's the result of a merge conflict (e.g. after attempting a rebase). If you wor...

eslaught on Sept 7, 2011 | parent | context | favorite | on: Git Is Simpler Than You Think

It's the result of a merge conflict (e.g. after attempting a rebase). If you work regularly with other people you end up seeing this a lot (or rather, whenever you both edit the part of the same file at the same time).