Closed Glitchy-Tozier closed 2 years ago
@dariogoetz Do you know why the Resolve conflicts
-button is disabled?
@dariogoetz Do you know why the
Resolve conflicts
-button is disabled?
I did some refactoring regarding the "rearrange folders" issue. This seems to have made things complicated. I'll try to resolve.
The failing tests are due to the Rocket
submodule having been moved (and some mistakes I made). I don't know, why it still looks for the submodule in the wrong location.
If the pull request is ready for merge, I will merge it unregarding these errors.
@dariogoetz Ready to merge!
Additionally, mention all the optimization-methods.