Newbie question: properties conflict on file

Hi I am using SVN for our project and came across a properties conflict
which I am not too sure how to handle. I have a file in SVN called app.css I
updated it recently but instead of a 'M' in status it is showing a 'C'. Upon
further investigation I see that there is a file app.css.prej. I read in the
book that this is a properties conflict and to investigate it by reading the
.prej file. So here is what it says:

Trying to change property 'svn:executable' from '*' to '*', but the property
does not exist.

Here is what I get when I do svn diff:

Property changes on: app.css
___________________________________________________________________
Name: svn:executable
   - *

I am not sure what I am to do here. Should I add the property svn:executable
to my app.css file? This to me to be unusual, since I have other files that
are excutable, but I do not remember ever having to set the svn property for
them.

Perhaps I could just force commit it or use svn resolve --accept mine-full
app.css?

Thanks in advance,
Bina
Received on 2008-10-03 00:44:19 CEST