On 2013-11-20 13:29, Johannes Sixt wrote: [...] > UU ppcadm/modules/quarantine.py > > That's strange. I can't tell what is going on. Perhaps you have some > criss-cross merges in your history that merge-recursive trips over? > > Sorry, I don't know how to help you further.
Hah! I worked it out! $coworker erroneously did a "git merge -s ours" into the branch I was merging in, and it undid more changes than he intended, which is what resulted in *everything* breaking for me. I've appropriately chastised him and most importantly understand why the problem occured, which puts my mind at ease. Thanks again for all your help. -- Regards, Matthew Cengia
Description: Digital signature