2014-12-16 14:24 GMT+01:00 Tait Clarridge <[email protected]>: > What about creating a branch called develop and working out of that > for all the pre-release/pre-RC work. >
that's actually (kind of) master-candidate > The default branch can be set in github, which is where the pull > requests will go by default. And when cloned, the default branch it > will check out. > Ah, that I didn't know. Because my only real problem is that pull requests now almost always go to the wrong branch... Thx, that closes the issue for me :-) Rainer > > On Tue, Dec 16, 2014 at 7:14 AM, Boylan, James <[email protected]> > wrote: > > If you are looking to shift that direction then 'master-ok' could work. > Or 'master-tested'. Or even just 'stable' denoting that it has successfully > had all testbench tests completed on it. > > > > I think as long as it is documented in the readme.md file then you can > really name it whatever you feel works. > > > > -- James > > --- Sent from my mobile phone --- > > > > ----- Reply message ----- > > From: "singh.janmejay" <[email protected]> > > To: "rsyslog-users" <[email protected]> > > Subject: [rsyslog] master branch > > Date: Tue, Dec 16, 2014 5:52 AM > > > > Master-ok sounds better than master. It conveys the intent very clearly. > > > > -- > > Regards, > > Janmejay > > > > PS: Please blame the typos in this mail on my phone's uncivilized soft > > keyboard sporting it's not-so-smart-assist technology. > > > > On Dec 16, 2014 5:14 PM, "Rainer Gerhards" <[email protected]> > wrote: > > > >> HI all, > >> > >> we decided that master branch receives updates only after testbench run. > >> How important is this to us that this branch is named "master"? I ask > >> because almost all pull requests are done against master branch, which > >> means I need to manually merge them to master-candidate and close the > PR as > >> "unmerged". > >> > >> It would probably much more efficient to have "master" be the > experimental > >> branch, and when the testbench succeeds move it to something like > >> "master-ok" (or so). > >> > >> Comments? > >> > >> Rainer > >> _______________________________________________ > >> rsyslog mailing list > >> http://lists.adiscon.net/mailman/listinfo/rsyslog > >> http://www.rsyslog.com/professional-services/ > >> What's up with rsyslog? Follow https://twitter.com/rgerhards > >> NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad > >> of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you > >> DON'T LIKE THAT. > >> > > _______________________________________________ > > rsyslog mailing list > > http://lists.adiscon.net/mailman/listinfo/rsyslog > > http://www.rsyslog.com/professional-services/ > > What's up with rsyslog? Follow https://twitter.com/rgerhards > > NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad > of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you > DON'T LIKE THAT. > > _______________________________________________ > > rsyslog mailing list > > http://lists.adiscon.net/mailman/listinfo/rsyslog > > http://www.rsyslog.com/professional-services/ > > What's up with rsyslog? Follow https://twitter.com/rgerhards > > NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad > of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you > DON'T LIKE THAT. > _______________________________________________ > rsyslog mailing list > http://lists.adiscon.net/mailman/listinfo/rsyslog > http://www.rsyslog.com/professional-services/ > What's up with rsyslog? Follow https://twitter.com/rgerhards > NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad > of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you > DON'T LIKE THAT. > _______________________________________________ rsyslog mailing list http://lists.adiscon.net/mailman/listinfo/rsyslog http://www.rsyslog.com/professional-services/ What's up with rsyslog? Follow https://twitter.com/rgerhards NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you DON'T LIKE THAT.
