I tried and got a conflicts error. Unsure how to proceed.

rabbit@ganymede:~/vm-dev/opensmalltalk-vm$ git pull origin fix_include_order
From https://github.com/OpenSmalltalk/opensmalltalk-vm
 * branch                fix_include_order -> FETCH_HEAD
Auto-merging stacksrc/vm/interp.c
CONFLICT (content): Merge conflict in stacksrc/vm/interp.c
...
Auto-merging spur64src/vm/cointerp.c
CONFLICT (content): Merge conflict in spur64src/vm/cointerp.c
Automatic merge failed; fix conflicts and then commit the result.

---
Kindly,
Robert


On 5/27/21 2:12 PM, Tobias Pape wrote:
Also, try the
	https://github.com/OpenSmalltalk/opensmalltalk-vm/tree/fix_include_order
branch for the time being.

Best regards
	-tobias

On 27. May 2021, at 20:04, Levente Uzonyi <leves@caesar.elte.hu> wrote:

The VM uses clang instead of gcc. So, you need to install clang.


Levente