X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f
X-Recipient: geda-user AT delorie DOT com
Message-ID: <20150318192839.5147.qmail@stuge.se>
Date: Wed, 18 Mar 2015 20:28:39 +0100
From: Peter Stuge <peter AT stuge DOT se>
To: geda-user AT delorie DOT com
Subject: Re: [geda-user] pcb alternatives
Mail-Followup-To: geda-user AT delorie DOT com
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>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201503181852.t2IIqJO7019440@envy.delorie.com>
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
Precedence: bulk

DJ Delorie wrote:
> > The only gotcha is that if your WIP stash conflicts with what you've
> > pulled,
> 
> Which happens a lot for me.  *That* is the problem with me and git.

stash pop does the right thing, the stash just stays around in a
corner that noone ever looks at.

If your WIP often conflicts with WIP of others then that seems
unrelated to tools and seems more about how your team works together.

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


Kind regards

//Peter