[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Mozilla cookies

From: Kai Hendry <hendry_at_cs.helsinki.fi>
Date: 2004-07-21 16:33:01 CEST

Is anyone here mad enough to put their ~/.mozilla under source control?


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
Received on Wed Jul 21 16:34:02 2004

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.