[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

Re: gEDA-user: origin/master ... origin/stable-1.6 ?

On Sat, 2011-01-08 at 03:02 +0100, Kai-Martin Knaak wrote:
> Hi Peter B, Peter C.
> Just noted that "git fetch" of git://git.gpleda.org/gaf reports 
> two branches. origin/master and origin/stable-1.6 . What is the 
> significance of these? Where should I look for the brave new features 
> that get pushed in the aftermath of the move from sourceforge to 
> launchpad?

origin/master is the place development happens
origin/stable-1.6 is the branch where the 1.6.x series is based

Typically, a fix lands in origin/master, and if it is a suitable fix for
the stable series, it will be cherry-picked into the stable branch as

so - in short, "origin/master". 

> PS: Any Peter A. around :-? 

I'm just heading to bed, and IIRC from IRC, so was Peter B.

Peter Clifton

Electrical Engineering Division,
Engineering Department,
University of Cambridge,
9, JJ Thomson Avenue,

Tel: +44 (0)7729 980173 - (No signal in the lab!)
Tel: +44 (0)1223 748328 - (Shared lab phone, ask for me)

geda-user mailing list