Please sign in to comment.
Merge when updating submodules on make
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).
- Loading branch information...