Hi, A co-worker and I are experimenting with VisualSVN on a VB.NET using Visual Studio 2005. He's been using the SVN by himself for a little while now, but now that I've joined the project, we're trying to figure out how we need to do our day to day tasks.
Our first experiments were with the both of us working on the same file. We think we figured out that the best thing to do was to obtain a lock on the file we need to work on so we can avoid having to merge two versions of the same file together. fine. So our next experiment is what has us stumped a bit. I added a module to the solution (module1.vb) and he added module2.vb to the same solution (our working copies of course). I committed my changes (the adding of module1.vb) and all is fine. He then goes to commit his change (the adding of module2.vb) and the solution freaks out, says there's a conflict and he can't view any of the files in the solution. If he clicks revert changes and checks the box for the solution file, he is then able to reload the project and see everything again, but the module he was trying to add is now gone (meaning it's not a part of the project anymore). What the heck are we doing wrong? We're going to keep searching the internet and any manual stuff we can locate, but I was hoping that this group could help quickly point us in the right direction. Chris
