X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f
Date: Wed, 18 Mar 2015 13:09:28 -0400
Message-Id: <201503181709.t2IH9StK014643@envy.delorie.com>
From: DJ Delorie <dj AT delorie DOT com>
To: geda-user AT delorie DOT com
In-reply-to: <20150318165331.25228.qmail@stuge.se> (message from Peter Stuge
	on Wed, 18 Mar 2015 17:53:31 +0100)
Subject: Re: [geda-user] pcb alternatives
References: <CAHLh21Cdm=YZuqCQ+gCHSviJquahr6cnAQ-VBLR4BSs-nfHOig AT mail DOT gmail DOT com> <CAOFvGD4+4bHXNYLvePi70wb_1A4=dQgb_Ov3xBghoKbXQUsSGA AT mail DOT gmail DOT com> <5508413E DOT 4000405 AT ecosensory DOT com> <46050a0c DOT 619 DOT 14c2850d052 DOT Webtop DOT 45 AT optonline DOT net> <CAGYR9veihi_M+B0HXptGYQLMO8=B_KOLM2wmrRNkMLG_9MdQrA AT mail DOT gmail DOT com> <alpine DOT DEB DOT 2 DOT 00 DOT 1503180357520 DOT 25799 AT igor2priv> <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>
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


> I think your life with Git at and outside work would be easier if
> you decided to learn ... I'm happy to help if I can.

I've been through the "let me teach you the git way" before.  It
doesn't stick because "the git way" is not the way I write code.  I've
used LOTS of CMS's over the decades, and git is the first one that
just doesn't do what I want.

> So don't create big commits. "Doctor, it hurts when I do this.."

I can't help if if one fix takes time and lines of code.  It's still
one fix.

> > and conflict management is git's weak point.
> 
> I'd say it's about the same as all other popular VCSes, they all seem
> to operate on source code line level.

Not "when conflicts happen" but "how you resolve them"