← Back to team overview

kicad-developers team mailing list archive

Re: Branches

 

I thought I made it clear what the current branches were for but I will
officially reiterate my previous comments.

The development branch is currently only open for 5.1 development.  This
includes 5.0 bug fixes, Jeff's UI refactoring, and the GTK3 fixes.  No
new features will be allowed until 5.1 is released.  I want to stay
focused on 5.1 to get the gtk3 fix release asap.  My fear is that if I
open the dev branch up to new features, we will get caught up in that
and forget about the gtk3 fix.

The 5.1 branch will go away.  I just haven't gotten around to it.

The only thing left to do is figure out the branch naming issue.
Apparently we cannot come up with a branch naming convention that
doesn't cause everyone to run out of the room with their hair on fire. :)

If anyone asks again what the official policy is, please point them to
this message.

Cheers,

Wayne

On 7/25/2018 8:45 AM, Simon Richter wrote:
> Hi,
> 
> On 24.07.2018 09:01, Maciej Sumiński wrote:
> 
>> At the moment the master branch contains all commits from 5.1 and a few
>> more. It might be the right moment to drop 5.1 branch.
> 
> As it should be. Well, ideally commits on 5.1 should be cherry-picked
> from master by the 5.1 release manager.
> 
> Do we have a release manager for 5.1? Or a scope for the release?
> 
> My suggestion:
> 
>  - 5.1: gtk3 (because that is what distros are waiting for)
>  - 5.2: UI updates (after 5.1 because they need user feedback and
> documentation updates)
> 
>    Simon




Follow ups

References