search

schungx / rhai

Rhai - An embedded scripting language for Rust [dev repo, may regularly force-push, pull from https://github.com/rhaiscript/rhai for a stable build]
https://github.com/rhaiscript/rhai
Apache License 2.0
9 stars 3 forks source link

Fix CI and reorganize tests #51

Closed jhwgh1968 closed 4 years ago

jhwgh1968 commented 4 years ago

By the way, @schungx, I don't think git will recognize the way I rearranged the files when you try to rebase your branch.

The easiest way to resolve the merge conflict is to put your test changes into the new files, and throw the old files away.

schungx commented 4 years ago

Hhhmmm... rebase seems to work fine...