title: Tortoise SVN - Case sensitivity issue under Windows - Problem Merging
body: <p>I have been working in a branch for a couple months and am now trying to merge the trunk into the branch, before finally merging my branch into the trunk.</p>
  
  <p>After successfully merging a few revisions, SVN threw an error about the "bin" folder being locked.  When I created my branch, the folder was called "Bin", but at this particular revision that threw the error, another developer inadvertently committed a duplicate directory called "bin".  During the merge, SVN attempted to bring down the new "bin", but Windows balked, throwing the lock error.</p>
  
  <p>My question is how to deal with this?  Although the project in question went through many changes, including deleting the Bin, deleting the bin, and eventually adding the Bin back, I have to replay all of those actions when I am merging revision-by-revision from the trunk to my branch.  How do I get past the error when it occurred in the past?  Do I go into Repo Browser and delete the duplicate "bin" folder in the old revision?  This is very frustrating because it wasn't an error when the other developer checked the duplicate directory in, but it causes an error when trying to merge/update that revision to my working copy.</p>
  
  <p>Also, am I supposed to be committing after merging each revision into my branch?  Or am I safe to keep merging and commit my branch only at the end?</p>
  
  <p>Thanks for any help you can provide.</p>