But I update no conflits where found cool,
But when I commit I hava a lot of messages like this :
cvs commit : connot commit with sticky date for file 'toto/toto.php'
I dont know what to do ?
It looks like you need to pass the '-A' argument to the update command in the first
instance - see the
Yeah it's cvs update -A (the most recent version of files), here I have
conflicts :
One of them was about I have a production and a dev verson of a file.
I was adviced to make a makefile :
my file config.php no longer belong to cvs, I would hava a config.template n
make a :
make prod :
sed
