X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f
X-Recipient: geda-user AT delorie DOT com
Message-ID: <20150318174247.29231.qmail@stuge.se>
Date: Wed, 18 Mar 2015 18:42:47 +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: <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> <201503181709 DOT t2IH9StK014643 AT envy DOT delorie DOT com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201503181709.t2IH9StK014643@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:
> > 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.

Hm, what do you mean by "the git way" ? I'm talking about learning
the data model which git uses internally to make that data model work
for you, not learning some particular workflow that someone else
thinks is great.


> I've used LOTS of CMS's over the decades, and git is the first one
> that just doesn't do what I want.

What do you 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.

That's true, but sometimes it's better to fix things a different way.

Anyway, how does the tool matter for "slow" large changes? I guess
it's also about how you can resolve conflicts and not about how they
happen.

I think the git command doesn't enforce any particular conflict
resolution tool, so you can use what you would have used with
other VCSes, assuming that it's a standalone utility. (Maybe this
is the problem?)


Kind regards

//Peter