Has this been resolved? I am experiencing the same issue and even though I have recreated my workspace from scratch, I get the same error. There are no half-baked merges to my knowledge.
NOTE: The Xlinks were messed up. Once I corrected those, all checked in as expected. Thanks