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

Ben Coman notifications at github.com
Thu Nov 22 14:36:55 UTC 2018


> I did not do that last step you did: ```git merge OpenSmalltalk/Cog --allow-unrelated-histories.```

But on that branch your last commit was "merge with Cog" and ```git log```  seemed to show history items from the Cog branch, and I couldn't guess how you did it.  Just asking to see if I could learn something new.

> 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.

Its a big merge and merging first into you local repo allows you to better review the final result before doing the PR, and makes that PR a simple fast-forward merge.

Also I presumed this applies...
   https://stackoverflow.com/questions/12413745/pull-requests-for-orphan-branch
though I've not tested this in practice. YMMV



-- 
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-441049076
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.squeakfoundation.org/pipermail/vm-dev/attachments/20181122/3d977a23/attachment.html>


More information about the Vm-dev mailing list