<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</head>
<body>
<p>I tried and got a conflicts error. Unsure how to proceed.<br/>
</p>
<p>rabbit@ganymede:~/vm-dev/opensmalltalk-vm$ <b>git pull origin
fix_include_order</b><br/>
From <a class="moz-txt-link-freetext" href="https://github.com/OpenSmalltalk/opensmalltalk-vm">https://github.com/OpenSmalltalk/opensmalltalk-vm</a><br/>
* branch fix_include_order -> FETCH_HEAD<br/>
Auto-merging stacksrc/vm/interp.c<br/>
CONFLICT (content): Merge conflict in stacksrc/vm/interp.c<br/>
...<br/>
Auto-merging spur64src/vm/cointerp.c<br/>
CONFLICT (content): Merge conflict in spur64src/vm/cointerp.c<br/>
Automatic merge failed; fix conflicts and then commit the result.<br/>
</p>
<div class="moz-signature">---<br/>
Kindly,<br/>
Robert<br/>
<br/>
<br/>
</div>
<div class="moz-cite-prefix">On 5/27/21 2:12 PM, Tobias Pape wrote:<br/>
</div>
<blockquote type="cite" cite="mid:0FE7E203-8941-42E9-A0C6-FD6303779F6E@gmx.de">
<pre class="moz-quote-pre" wrap="">Also, try the
<a class="moz-txt-link-freetext" href="https://github.com/OpenSmalltalk/opensmalltalk-vm/tree/fix_include_order">https://github.com/OpenSmalltalk/opensmalltalk-vm/tree/fix_include_order</a>
branch for the time being.
Best regards
-tobias
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">On 27. May 2021, at 20:04, Levente Uzonyi <a class="moz-txt-link-rfc2396E" href="mailto:leves@caesar.elte.hu"><leves@caesar.elte.hu></a> wrote:
The VM uses clang instead of gcc. So, you need to install clang.
Levente
</pre>
</blockquote>
<pre class="moz-quote-pre" wrap="">
</pre>
</blockquote>
</body></html>