CODEWITHSUNDEEP
visual-studiosvntortoisesvn
Bex
Bex

Reputation: 4918

SVN How do I make visual studio warn me there is a newer version of a file?

I hope this questions isn't too obvious or vague but I am problems searching for an answer as I'm not sure of terminology.

I am using TortoiseSVN with Unfuddle and Visual Studio 2010.

Previously I used Sourcegear's Fortress which worked really well for me but my new company uses SVN.

The problem I am currently having is:

If I edit a file in visual studio, then commit (Check in) the changes back to SVN and then My colleague then goes to edit the same file (checks it out) from his visual studio it doesn't automatically update to the new version that I just checked in, so when he then goes to check in the file after he's changed it it throws a conflict error.

So my question is: Is there a setting that will automatically make it update to the latest version when you check out a file? Or am I using it wrong?

Thanks for any help.

Bex

Upvotes: 1

Views: 208

Answers (1)

Sander Rijken
Sander Rijken

Reputation: 21615

You don't "check out" files, you should update before editing. Subversion uses a different versioning model than what you're used to.

Also make sure to use a good conflict editor when conflicts do occur. Personally I use DiffMerge configured as both diff and merge tool in AnkhSVN.

Upvotes: 2

Related Questions