polygene-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Niclas Hedhman <nic...@hedhman.org>
Subject Re: [HELP] Merge Error
Date Fri, 24 Apr 2015 10:18:48 GMT
I am fine with a temporary unstable 'master'.


On Fri, Apr 24, 2015 at 6:05 PM, Paul Merlin <paul@nosphere.org> wrote:

> Niclas Hedhman a écrit :
> > And I tried to remove 'master', but that is also not allowed.
> :)
>
> > One choice is to ignore the problem and it is auto-fixed at 2.1 release,
> > which we want to do soon anyway.
> That would be the easier path, only drawback being that until 2.1 the
> master branch is not 'stable' as advertised.
>
> > Another is to not consider 'master' the stable one, but create a new
> branch
> > (such as 'latest' or 'releases') and change the docs for that.
> Yes but we can't remove master, so what about it?
>
> > So, yeah... Not sure what is the the better choice here.
> I'd lean towards ignoring the problem and focusing on 2.1 as our first
> Apache release.
>
> WDYT?
>
> /Paul
>
>


-- 
Niclas Hedhman, Software Developer
http://zest.apache.org/qi4j <http://www.qi4j.org> - New Energy for Java

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message