[Vm-dev] [OpenSmalltalk/opensmalltalk-vm] Pullrequest2/vmmaker (#308)

[George Ganea]

The merge into Cog should be done once the pull request is accepted. In your fork, you merged OpenSmalltalk/Cog into the vmmaker branch. That is why that blue line is there. I did not do that last step you did: `git merge OpenSmalltalk/Cog --allow-unrelated-histories`.

I'm not sure I understand if/why we need to merge OpenSmalltalk/Cog into feenkcom/pullrequest3/vmmaker before we merge feenkcom/pullrequest3/vmmaker into OpenSmalltalk/Cog.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/308#issuecomment-441007980
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.squeakfoundation.org/pipermail/vm-dev/attachments/20181122/dd891a45/attachment.html>