SVN resolve problem: svn: warning: '#!/bin' is not a working copy

I'm working with a main trunk and several branches. At one point, I have added a file (script) to the trunk, merged it throughou开发者_高级运维t the rest of the branches (but didn't commit the branch changes).

Then I modified again the script and when I merged throughout the rest of the branches, SVN reported tree conflicts.

A  +  C experimentation.sh
      >   local add, incoming add upon merge

When trying to resolve (either with --accept 'working', 'theirs-full','mine-full'), I get an unbelievable:

svn: warning: '#!/bin' is not a working copy

where #!/bin/bash is, of course, the first line in the script file.

So far I've been unsuccessful in getting rid of this problem, so I can't make further commits. Any help much appreciated.

---

When svn says something is not a working copy, it means you are applying svn commands on a folder that is not a working copy ( or part of it) - ie doesn't have the .svn meta files.

I am not able to replicate you exact situation, but, delete the #!/bin folder in your working copy ( which you don't need of course!) and try the operations.