You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Kai Hendry <he...@cs.helsinki.fi> on 2004/07/21 14:33:01 UTC
Mozilla cookies
Is anyone here mad enough to put their ~/.mozilla under source control?
http://svn.natalian.org/home/.mozilla/
My cookies continually get in conflict:
scrooge-15$ svn commit -m "tweak"
svn: Commit failed (details follow):
svn: Aborting commit: '/home/hendry/.mozilla/default/ack41g03.slt/cookies.txt' remains in conflict
Any advice?
Should I file a bug asking for better merging?
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Mozilla cookies
Posted by Ben Collins-Sussman <su...@collab.net>.
On Wed, 2004-07-21 at 09:33, Kai Hendry wrote:
> Is anyone here mad enough to put their ~/.mozilla under source control?
>
> http://svn.natalian.org/home/.mozilla/
>
> My cookies continually get in conflict:
>
> scrooge-15$ svn commit -m "tweak"
> svn: Commit failed (details follow):
> svn: Aborting commit: '/home/hendry/.mozilla/default/ack41g03.slt/cookies.txt' remains in conflict
>
> Any advice?
Um, resolve the conflict, and then run 'svn resolved' as usual? :-)
If there's a specific problem in the way 'svn update' produces
conflicts, show us details.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org