Re: [Help-smalltalk] Fwd: VisualGST Issues

[Paolo Bonzini]

On Thu, May 27, 2010 at 21:56, Giuseppe Luigi Punzi Ruiz
<address@hidden> wrote:
> Are this merged to test?

Not yet, I didn't get answers to the (implicit) questions I asked.

>> I have no problem upgrading to master for 3.2.1 if it is better.

Is it better?

>> - let's drop the stable branch for now and fix the above issues on the
>> master branch.
>>
>> - as soon as master is ready to be imported into GNU Smalltalk, Gwen
>> should do "git checkout stable; git merge -s ours master" and push it. _Only
>> then_ I'll import it.  This will be a blocker for 3.2.1.
>>
>> - new features will _exclusively_ be developed on the master branch.
>>
>> - bugfixes will _exclusively_ be developed on the stable branch, and
>> merged from there into the master branch.  It's up to Gwen whether he wants
>> to do the stable->master branch himself, or he prefers to get two pull
>> requests.

Is this okay?

Paolo