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=relaxed/relaxed;
	d=gmail.com; s=20120113;
	h=mime-version:in-reply-to:references:date:message-id:subject:from:to
	:content-type;
	bh=g2XevVTaVX1NO+5j8yAD2AfP/JLUtek2ux1qX/h2LZw=;
	b=Is3mg0ETDbdnKnxiEGukSoPl+8unB2oU2YDpowwJ7E+W9lcgvAnrv7UOrswrBDeiS6
	JZ8jARZuYO0DjMWtSzk3vmTpb+5PdXJlb3Mzq7cGoQ8kb4ERzc8qdMJMdI+pL2NMK3vW
	y7Sv+9ublP/g+RvJFgTmg/sC98haKyKtBcnPyXN3CC1Q0N7RNCanuiupcHafwOFbUgyH
	Wfb5/3jGd8+5YuN4/eneoEm3fY48x9l+bqZRPlvjcIbPmXByg00ZEKTDFH03bgO5449H
	1TnWPm8HCnMR+5dqVfREFSPP3rzdcUHdNLlXomuICMJMKJyy4nr6405bMimlTcAZhiZn
	E3rQ==
MIME-Version:	1.0
In-Reply-To:	<20121120193855.27378.qmail@stuge.se>
References:	<CACwWb3DJsO8J_zAfcSLK=_4iviZy05ZiKj1TFMUUSA8nxO5TwA AT mail DOT gmail DOT com>
	<CAGde_xOFELRBJZ30utu1x+B-y+8Vo+EDGOKPLqyafO+i3ez0QQ AT mail DOT gmail DOT com>
	<CAC4O8c9Z3zmCeeeVU-=BpYTWv1J+3bBh-YcWyepV3U0nftf=gw AT mail DOT gmail DOT com>
	<20121120193855 DOT 27378 DOT qmail AT stuge DOT se>
Date:	Tue, 20 Nov 2012 14:22:09 -0900
Message-ID:	<CAC4O8c8nzG5bN0tnsU0xL23cjvHpieazAsfVY-KJ2_zkQz27vQ@mail.gmail.com>
Subject:	Re: [geda-user] branches
From:	Britton Kerin <britton DOT kerin AT gmail DOT com>
To:	geda-user AT delorie DOT 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

On Tue, Nov 20, 2012 at 10:38 AM, Peter Stuge <peter AT stuge DOT se> wrote:
> Britton Kerin wrote:
>> don't get this situation:
>>
>> 1.  Bob clones
>> 2.  Bob edit-compiles-debugs
>> 3.  Bob rebases, which breaks something that he doesn't catch
>> 4.  Bob pushes
>
> Bob is donitrong IMO. He needs to always edit-compile-debug on latest
> origin code.

Agreed in theory, but this is not going to happen in practice, at least once
development hits a certain pace, or if you get unlucky.  Nobody wants to break
their train of thought every hour to merge changes that probably don't collide.

Britton

- Raw text -