I'm trying to commit changes to a driver into version control. I got a
message saying "Conflicts Exist - Your project contains one or more
files that are in a conflicted state...... All conflicts must be
resolved before you can check in to the version control server"
I clicked OK, then did Compare Revisions on the driver, and it's telling
me No differences. My guess is that the driver checkin actually did
complete but there's something else that's conflicting. The message is
too vague for me to figure out what, so I'm hoping there's some way to
pinpoint what is conflicting.
Any help much appreciated.