Yup, you still have to update before you can commit. And it still sucks awful when you've got two or more people working in the same area... So it's still: do

Yup, you still have to update before you can commit. And it still sucks awful when you've got two or more people working in the same area... So it's still: do some work, go to check in, see that there's an upstream conflict, curse, copy your working copy of the conflicted file into a notepad buffer, just in case, try to update, spend the next 15 minutes verifying that stuff didn't get hosed, and fix it if necessary, then go to try to commit again... And sometimes there's another conflict...