Re: [GNUnet-developers] www stable is broken

[dvn]

Schanzenbach, Martin transcribed 2.7K bytes:
> I think it should be fine now? So I should normally work in
> stable and later merge it into master?
> Or the other way around? What is on the website?

yea, i've had to relearn this several times...

Work in master - that goes to stage.gnunet.org

merge or push commits to stable afterwards.

i've taken to pushing the commits from master to the stable 
branch instead of merging: 

`git push origin master:stable`

unless, of course they actually need to _merge_ due to stable having
commits which master does not, for example.


> > On 5. Oct 2019, at 08:33, ng0 <address@hidden> wrote:
> > 
> > IGnore the broken part, but we should merge master into stable.
> > 
> > also the updating / rebuilding needs to be faster. hmm..
> > ng0 transcribed 446 bytes:
> >> Hi,
> >> 
> >> can someone fix whatever is up with stable (www.gnunet.org)
> >> and also merge stable into "master" (stage.gnunet.org), and
> >> not work the other way around?
> >> 
> >> Thanks!
> >> 
> >> _______________________________________________
> >> GNUnet-developers mailing list
> >> address@hidden
> >> https://lists.gnu.org/mailman/listinfo/gnunet-developers
> > 
> > _______________________________________________
> > GNUnet-developers mailing list
> > address@hidden
> > https://lists.gnu.org/mailman/listinfo/gnunet-developers
> 



> _______________________________________________
> GNUnet-developers mailing list
> address@hidden
> https://lists.gnu.org/mailman/listinfo/gnunet-developers

signature.asc
Description: PGP signature