<blockquote>
<p>I did not do that last step you did: <code>git merge OpenSmalltalk/Cog --allow-unrelated-histories.</code></p>
</blockquote>
<p>But on that branch your last commit was "merge with Cog" and <code>git log</code>  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.</p>
<blockquote>
<p>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.</p>
</blockquote>
<p>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.</p>
<p>Also I presumed this applies...<br>
<a href="https://stackoverflow.com/questions/12413745/pull-requests-for-orphan-branch" rel="nofollow">https://stackoverflow.com/questions/12413745/pull-requests-for-orphan-branch</a><br>
though I've not tested this in practice. YMMV</p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/308#issuecomment-441049076">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AhLyW4XnRWERnwHJjEyEvM84d2qAGvqbks5uxraHgaJpZM4YszJr">mute the thread</a>.<img src="https://github.com/notifications/beacon/AhLyW3YUazU-OWSofvqRjMCkCn7jktS7ks5uxraHgaJpZM4YszJr.gif" height="1" width="1" alt="" /></p>
<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/OpenSmalltalk/opensmalltalk-vm","title":"OpenSmalltalk/opensmalltalk-vm","subtitle":"GitHub repository","main_image_url":"https://assets-cdn.github.com/images/email/message_cards/header.png","avatar_image_url":"https://assets-cdn.github.com/images/email/message_cards/avatar.png","action":{"name":"Open in GitHub","url":"https://github.com/OpenSmalltalk/opensmalltalk-vm"}},"updates":{"snippets":[{"icon":"PERSON","message":"@bencoman in #308: \u003e I did not do that last step you did: ```git merge OpenSmalltalk/Cog --allow-unrelated-histories.```\r\n\r\nBut 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.\r\n\r\n\u003e 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.\r\n\r\nIts 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.\r\n\r\nAlso I presumed this applies...\r\n   https://stackoverflow.com/questions/12413745/pull-requests-for-orphan-branch\r\nthough I've not tested this in practice. YMMV\r\n\r\n"}],"action":{"name":"View Pull Request","url":"https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/308#issuecomment-441049076"}}}</script>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/308#issuecomment-441049076",
"url": "https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/308#issuecomment-441049076",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
},
{
"@type": "MessageCard",
"@context": "http://schema.org/extensions",
"hideOriginalBody": "false",
"originator": "AF6C5A86-E920-430C-9C59-A73278B5EFEB",
"title": "Re: [OpenSmalltalk/opensmalltalk-vm] Pullrequest2/vmmaker (#308)",
"sections": [
{
"text": "",
"activityTitle": "**Ben Coman**",
"activityImage": "https://assets-cdn.github.com/images/email/message_cards/avatar.png",
"activitySubtitle": "@bencoman",
"facts": [

]
}
],
"potentialAction": [
{
"name": "Add a comment",
"@type": "ActionCard",
"inputs": [
{
"isMultiLine": true,
"@type": "TextInput",
"id": "IssueComment",
"isRequired": false
}
],
"actions": [
{
"name": "Comment",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"IssueComment\",\n\"repositoryFullName\": \"OpenSmalltalk/opensmalltalk-vm\",\n\"issueId\": 308,\n\"IssueComment\": \"{{IssueComment.value}}\"\n}"
}
]
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/308#issuecomment-441049076"
}
],
"@type": "OpenUri",
"name": "View on GitHub"
},
{
"name": "Unsubscribe",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"MuteNotification\",\n\"threadId\": 414397035\n}"
}
],
"themeColor": "26292E"
}
]</script>