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=6qGW7ayRTqski33CoeW6v0NULuhDVWl/u41MImreQPo=;
	b=O1QH9nDQ+mL3ne1/7XnJAbbpoavFlVXz+GXXmIu3KHb3RqkRovZCzYYEJ3O0ZCdcR7
	e7Z1eYXdZwwYQmmI6FydHa5bTh9BRbTUIJOxFiS3Q58zEfaLazAs7c628kyaV3vrxQ3N
	teTv4/ZLN0KrtDGuLOJ7vpoINcjBmvagoimAHRvM6lfp0PtaF1hRcEXIVmKFyPkfLyuf
	PbtHsWTBvOanMvUhC4xUzH9nMFKbRAkBvsZHAOcGvkiMMoOqRa/7A2hzaulq1QwQ7NJd
	XG854GFa+Y+Z5LHgimWSC1XrZS/cus4l9209ISAL4MBRCb8u2ORqDQhYmwoyi6DnpACw
	HUOA==
MIME-Version:	1.0
In-Reply-To:	<CACwWb3DJsO8J_zAfcSLK=_4iviZy05ZiKj1TFMUUSA8nxO5TwA@mail.gmail.com>
References:	<CACwWb3DJsO8J_zAfcSLK=_4iviZy05ZiKj1TFMUUSA8nxO5TwA AT mail DOT gmail DOT com>
Date:	Tue, 20 Nov 2012 11:44:48 +0100
Message-ID:	<CAGde_xOFELRBJZ30utu1x+B-y+8Vo+EDGOKPLqyafO+i3ez0QQ@mail.gmail.com>
Subject:	Re: [geda-user] branches
From:	Svenn Are Bjerkem <svenn DOT bjerkem AT googlemail 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 20 November 2012 11:24, Levente <leventelist AT gmail DOT com> wrote:
> I have some slightly off topic question.
>
>
> How the branches are treated? If we make some commit to the stable-1.8 will
> it ever be merged to the master? When do we fork a new branch? If we make a
> change to the master, how they going to go to the stable-x.y branch?

I am not a dev, but I am using git at work, and I got into the same
thought for my own one-man git use.
Since git is so powerful and can be used in so many ways, I just copy
this link again.
http://nvie.com/posts/a-successful-git-branching-model/

It is a model with some supporting git overlay, but it is also a nice
discussion on what problems distributed programmers may face.

-- 
Svenn

- Raw text -