X-Authentication-Warning:	delorie.com: mail set sender to geda-user-bounces using -f
Date:	Sat, 2 Jan 2016 13:55:21 -0500
Message-Id:	<201601021855.u02ItLTT022342@envy.delorie.com>
From:	DJ Delorie <dj AT delorie DOT com>
To:	geda-user AT delorie DOT com
In-reply-to:
	<CAC4O8c-NLWL2qycf0VrkRZzTGqCYdTNucc4kC3OycS7UTEAh_A AT mail DOT gmail DOT com>
	(geda-user AT delorie DOT com)
Subject:	Re: [geda-user] Merging stuff. How to make it happen
References:	<CAC4O8c_p5bMB1cKzDEsQFSnbZvY3TgnczH94pO_qCoJmiv2iWQ AT mail DOT gmail DOT com>
	<20160101225941 DOT 6ed5eff1 AT floyd DOT freeelectron DOT net> <CAC4O8c-NLWL2qycf0VrkRZzTGqCYdTNucc4kC3OycS7UTEAh_A AT mail DOT gmail DOT com>
Reply-To:	geda-user AT delorie DOT com

> Sounds reasonable.  For me there are two things I want "merge" to mean:

PCB's branch usage is slightly different than gnucap, and if we had a
more lively development we might revisit this.

"Master" is the mess where everything gets merged into, from whatever
user branch they originated.  I don't mind the occasional "undo" patch
if it's too heavily broken.

Releases are done on a branch off of master, since there are changes
that are only done to releases (like tag version numbers in the
sources) and never on master.

Hopefully this makes people less paranoid about breaking master by
merging :-)

- Raw text -