This allows a checkout to proceed if the checkout target contents are already staged.  This seems generally safe, and is the expected behavior during a merge.  We could put this behind a flag if it is odd or unexpected in the general case.