[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Chicken-hackers] Merge chicken-5 into master? Also: git help needed
From: |
Mario Domenech Goulart |
Subject: |
Re: [Chicken-hackers] Merge chicken-5 into master? Also: git help needed |
Date: |
Sat, 09 Dec 2017 09:09:51 +0100 |
Hi,
On Fri, 8 Dec 2017 20:49:58 +0100 Peter Bex <address@hidden> wrote:
> On Wed, Dec 06, 2017 at 09:42:48PM +0100, Peter Bex wrote:
>> On Tue, Dec 05, 2017 at 09:17:10PM +0100, Peter Bex wrote:
>> > Just a quick question: Now that we've started the 4.13.0 release
>> > process, should we branch off a "chicken-4" branch from master
>> > and merge "chicken-5" into master?
>>
>> In preparation of this, it may make sense to branch chicken-4 off
>> from master first, and do the merge of chicken-5 into master later.
>
> This has been done now: master is still unchanged, chicken-4 is a copy
> of that branch.
>
> Next week (Monday? Tuesday?) I'll merge chicken-5 into master.
>
> So, please avoid committing to master until then or if you do, ensure
> you merge it into chicken-4.
Thanks, Peter.
The salmonella linux machines have been configured to use the chicken-4
branch.
All the best.
Mario
--
http://parenteses.org/mario
Re: [Chicken-hackers] Merge chicken-5 into master? Also: git help needed, Peter Bex, 2017/12/06