-
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 | ||
| speed | ||
| src | ||
| test | ||
| .gitattributes | ||
| .gitignore | ||
| .gitmodules | ||
| GPL-LICENSE.txt | ||
| MIT-LICENSE.txt | ||
| Makefile | ||
| README.md | ||
| version.txt |