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 local config does not get overwritten, nor checked in?
While I'm here, is the answer different for a directory?
I'm using Tortoise SVN, but command line answers are cool.
Thanks!
[Sorry if this basic question has been asked before... I looked but didn't find it.]
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)