[Project_owners] CVS conflict problem

Chris Neale cdn at mozdev.org
Tue Nov 16 22:58:54 EST 2004


On Tuesday 16 November 2004 22:05, Irongut at vodafone.net wrote:
> Hi,
>
> I've got a cvs conflict on a file I removed from my project some time ago
> (when I first started) and I'd like to resolve it because it is bugging me.
> Whenever I commit, update or add I get:
>
> Hovercraft is now updating: delphi/www
> C default.css
> ? .cvsignore
> ? favicon.ico
> ? robots..txt
> Success, CVS operation completed
>
> I've tried creating a new default.css, adding it to cvs, committing it,
> removing it and committing the removal but I still get the conflict.
>
> Help!
>
> Thanks,
> Dave.
>
> Dave Murray
> Mozilla-Delphi Project
> Glasgow, UK
> irongut at vodafone dot net
>

default.css terminated.

-- 

cdn

--

Extensions for Mozillan Applications [ http://cdn.mozdev.org/ ]

get Orbit3+1, Orbit Retro and other Mozilla themes from : 
http://themes.mozdev.org/


More information about the Project_owners mailing list