X-Authentication-Warning:	delorie.com: mail set sender to geda-user-bounces using -f
Date:	Wed, 18 Mar 2015 15:30:34 -0400
Message-Id:	<201503181930.t2IJUY70021704@envy.delorie.com>
From:	DJ Delorie <dj AT delorie DOT com>
To:	geda-user AT delorie DOT com
In-reply-to:	<20150318192839.5147.qmail@stuge.se> (message from Peter Stuge on
	Wed, 18 Mar 2015 20:28:39 +0100)
Subject:	Re: [geda-user] pcb alternatives
References:	<CAGYR9ve_n7VmZ8x-jCQK5eKHMNGp6an9o8EwYZnWQWFiCpGnXg AT mail DOT gmail DOT com> <alpine DOT DEB DOT 2 DOT 00 DOT 1503180827170 DOT 25799 AT igor2priv> <CAC4O8c--CeEiKjxCKrs38XGjOyPS0Cy6scZ5HsAFgpi5xDpP_w AT mail DOT gmail DOT com> <201503181619 DOT t2IGJkZD012945 AT envy DOT delorie DOT com> <20150318165331 DOT 25228 DOT qmail AT stuge DOT se> <201503181709 DOT t2IH9StK014643 AT envy DOT delorie DOT com> <20150318174247 DOT 29231 DOT qmail AT stuge DOT se> <201503181744 DOT t2IHi8Im015958 AT envy DOT delorie DOT com> <20150318184822 DOT 2124 DOT qmail AT stuge DOT se> <201503181852 DOT t2IIqJO7019440 AT envy DOT delorie DOT com> <20150318192839 DOT 5147 DOT qmail AT stuge DOT se>
Reply-To:	geda-user AT delorie DOT com
Errors-To:	nobody AT delorie DOT com
X-Mailing-List:	geda-user AT delorie DOT com
X-Unsubscribes-To:	listserv AT delorie DOT com

> You'd have to resolve the same conflicts if you svn up or cvs commit, right?

Yes, of course.  But it's easy (process-wise) to resolve the conflicts
with svn or cvs.

- Raw text -