0

I committed my changes awhile back, but my changes were reverted due to conflicts. So, now I'm trying to commit my changes again. I'm basically adding back the same directories and files. But no matter what I do, the folders always show "Obstructed" when I try and commit using Visual SVN. I've tried doing a cleanup and update but I still get the errors on the folders. Any ideas?

Joel Coehoorn
  • 399,467
  • 113
  • 570
  • 794
bsh152s
  • 3,178
  • 6
  • 51
  • 77

1 Answers1

1

You need to resolve the conflicts. Update the relevant folders, and follow the conflict resolution procedures. It's not that scary, I promise :)

Noon Silk
  • 54,084
  • 6
  • 88
  • 105
  • It turns out that I was merging files between 2 local repositories outside of visual studio and I must have corrupted the destination repository by copying some svn files. I reverted the directories and re-added the directories and was up and running again. – bsh152s Dec 20 '10 at 01:40