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=
	message-id:date:from:mime-version:to:subject:references
	:in-reply-to:content-type:content-transfer-encoding; s=beta; bh=
	yerKinVIbZK5NOORRLkCK+sYs3j/Si/l/w6wKNSltu4=; b=KoNAr89coWs7Xo3p
	NRzyNHZAy++00XfwsypB40YFMelRn/IR40UsSc9lxZhgfFysNQ8SOvTRnchfPKZX
	/zsfkE9b6Y+DR5O1pQjfsH8vld1Qnb/vizNLmiWP4UN/f7HUAHm6THBWNL6KCOB8
	PJ8fl8CF+zcNHfKoMJsab0cmBR4=
Message-ID: <5097D24C.3020007@jump-ing.de>
Date: Mon, 05 Nov 2012 15:50:52 +0100
From: Markus Hitter <mah AT jump-ing DOT de>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121011 Thunderbird/16.0.1
MIME-Version: 1.0
To: geda-user AT delorie DOT com
Subject: Re: [geda-user] The state of gEDA/gaf (Was gEDA/PCBs diversity, Was:
 Pin hole size)
References: <CANqhZFxYH+Y5U1ai7ey-s+4nz6eYDM2vx3aMDb7WuigNXmi4AQ AT mail DOT gmail DOT com> <1511E63C-F435-44B1-9734-C7AF7AF49A92 AT sbcglobal DOT net> <20121030132922 DOT GY32696 AT fi DOT muni DOT cz> <201210312340 DOT q9VNe3VW012697 AT envy DOT delorie DOT com> <CAC4O8c-xvCH8j2h3K3+ymO0Zgbru_JqDavqojY81iT_C=-zPrw AT mail DOT gmail DOT com> <CAGde_xOu96b1jxN1n2km3_OAkX9umshs9FQF+Gdjgsbw_Mt4qQ AT mail DOT gmail DOT com> <CAC4O8c8BiPJSJyvTDs337ix2e==+bLwzz3TgqD8rV+B4TPkSxw AT mail DOT gmail DOT com> <k76358$9fs$1 AT ger DOT gmane DOT org> <CAC4O8c9JM0PsC66_tGAYOGAZx1vUR2ZwJr2dZCKihqt_JdfBWQ AT mail DOT gmail DOT com> <CAGde_xOMuuN_Gz9hdw1OJtvVDWTZGER5CoCnMpONkvi9cCHqTQ AT mail DOT gmail DOT com>
In-Reply-To: <CAGde_xOMuuN_Gz9hdw1OJtvVDWTZGER5CoCnMpONkvi9cCHqTQ@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Reply-To: geda-user AT delorie DOT com

Am 04.11.2012 20:58, schrieb Svenn Are Bjerkem:

> http://nvie.com/posts/a-successful-git-branching-model

For my part I stopped to use the concept of merging some time after 
moving to Git. The good parts of a branch get cherry-picked onto master 
and the unwanted parts get deleted from the branch. As branches are 
constantly rebased to master, they eventually dissolve into nothing.

The good thing with this strategy is, the main trunk is one straight 
line, making bisecting simple. Also, merging can be error prone, because 
feature branches often come with big differences, especially if they're 
older.


Markus

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