I'm constantly having to merge file versions because someone checked out a file I was working on. This seems to defeat the purpose of soure control, but in the meantime I have to work with this system.
What does it mean to "shelve" file changes? Is there any way that the person who checked out my file can at least SEE what I've changed so they can avoid stepping on my toes? What's the best way to deal with this problem?