X-Authentication-Warning:	delorie.com: mail set sender to geda-user-bounces using -f
X-Recipient:	geda-user AT delorie DOT com
DKIM-Signature:	v=1; a=rsa-sha256; c=simple; d=mail.ud03.udmedia.de; h=
	mime-version:in-reply-to:references:content-type:message-id
	:content-transfer-encoding:from:subject:date:to; s=beta; bh=mSVt
	iJ58AMi1OrXULjumg2kfsuIUocOl8lD+1saUddE=; b=DsHmHOVwWp+sVmh9aglQ
	+KdDGoLsF2VvNVq+xBrqu4bjlMpmBGUI907bnqji4ilpZu6fRjFAXQYX7wc5GN6v
	1dlA1OKhRxTnW+0yZrr9T0nCvrnAZE/0zHamnSAYZwTr5Nj9LqPVBva6CRQVsy2h
	EElk44IHehxSWazbR5H6XS0=
Mime-Version:	1.0 (Apple Message framework v753.1)
In-Reply-To:	<6288E8C7-BD78-44D2-9E2D-85C7257E0314@gmail.com>
References:	<1377775142 DOT 15398 DOT 1 DOT camel AT pcjc2lap> <4F0C8F27-B063-44CF-9011-63D2B62F3FD9 AT jump-ing DOT de> <3752e7fd48358f6e97a09d34392997aa AT cam DOT ac DOT uk> <D5CCEA61-742E-4726-A779-9ADC45D580B4 AT jump-ing DOT de> <87txi7zqkg DOT fsf AT harrington DOT peter-b DOT co DOT uk> <522086BD DOT 6060405 AT jump-ing DOT de> <6288E8C7-BD78-44D2-9E2D-85C7257E0314 AT gmail DOT com>
Message-Id:	<98F858F6-318B-4F88-B17A-11791799B1A7@jump-ing.de>
From:	Markus Hitter <mah AT jump-ing DOT de>
Subject:	Re: merging versus rebasing (was Re: [geda-user] Thoughts on mechanical CAD interaction...)
Date:	Sat, 31 Aug 2013 14:15:58 +0200
To:	geda-user AT delorie DOT com
X-Mailer:	Apple Mail (2.753.1)
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

Am 31.08.2013 um 01:59 schrieb Charles Lepple:

>> If we'd create a distinct
>> history for every tiny bugfix-branch, we'd end up in a pretty mess.
>> This are the reasons why I hope the idea of merging goes away, once
>> people get used to Git.
>
> Counterexamples: Buildbot, or just about any project that uses  
> something like the Github pull interface extensively.

I host two projects on Github and the experience is, this fork-and- 
pull-request thing doesn't work at all. Pull requests often bit-rot  
within hours and there's no way to refine them. Requests come from  
repos which no longer match the receiving one. Many pull requests  
come with very sloppy code, like lots of whitespace errors, so  
refinement is almost mandatory.

All you can do is to format-patch commits there and git-am with  
commit --amend them here. A workflow similar to what was done in the  
CVS days.

> Given how many commits Peter B. has in the gEDA repository...


They total to exactly two over the entire history of pcb.


Markus

- - - - - - - - - - - - - - - - - - -
Dipl. Ing. (FH) Markus Hitter
http://www.jump-ing.de/

- Raw text -