checkout -f: deal with a D/F conflict entry correctly