On the SVN server, there is a file called config.conf. I have a local version called the same thing (in the same place). How can I make sure that my loc
SVN will always think that that file is part of the repository if you name it the same and stick it in the same directory. Your options are
mv config.conf config.conf.theirs && mv config.conf.mine config.conf and then run your app)