<p>First, Jakob, huge thanks for this.  The weird symptoms of getting merge conflicts appearing in certain files after each push has disappeared.  Second, I did apply the script manually but it made no alterations to sqSCCSVersion.h in my case (it was already localized to my machine).  So it may not be necessary to run it, but it does no harm.</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/227#issuecomment-450514655">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AhLyW4i8ylIhPJ07F9Dapa-UZXBMmnoQks5u98KLgaJpZM4Sl0aO">mute the thread</a>.<img src="https://github.com/notifications/beacon/AhLyW3KNYGcYuKHl92npGNsbzjrF2RUYks5u98KLgaJpZM4Sl0aO.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://github.githubassets.com/images/email/message_cards/header.png","avatar_image_url":"https://github.githubassets.com/images/email/message_cards/avatar.png","action":{"name":"Open in GitHub","url":"https://github.com/OpenSmalltalk/opensmalltalk-vm"}},"updates":{"snippets":[{"icon":"PERSON","message":"@eliotmiranda in #227: First, Jakob, huge thanks for this.  The weird symptoms of getting merge conflicts appearing in certain files after each push has disappeared.  Second, I did apply the script manually but it made no alterations to sqSCCSVersion.h in my case (it was already localized to my machine).  So it may not be necessary to run it, but it does no harm."}],"action":{"name":"View Pull Request","url":"https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/227#issuecomment-450514655"}}}</script>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/227#issuecomment-450514655",
"url": "https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/227#issuecomment-450514655",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>