• Carl Fürstenberg's avatar
    Merge when updating submodules on make · a2faed34
    Carl Fürstenberg authored
    When  running make, the submodule update will remove all local changes.
    Adding flag --rebase or --merge does solve the issue. rebase will
    probably make it cleaner, but it might stop on conflict, thus --merge
    will result in fewer (probably none).
    a2faed34
Name
Last commit
Last update
build Loading commit data...
speed Loading commit data...
src Loading commit data...
test Loading commit data...
.gitattributes Loading commit data...
.gitignore Loading commit data...
.gitmodules Loading commit data...
GPL-LICENSE.txt Loading commit data...
MIT-LICENSE.txt Loading commit data...
Makefile Loading commit data...
README.md Loading commit data...
version.txt Loading commit data...