| /** | |
| * More complete example code accompanying Write Your Own Dependency Injection Container. | |
| * This is the most straight forward implementation of the DI container. While there is | |
| * slightly more boilerplate there are also more customization and documentation points. | |
| * | |
| * Author Nicolas Croad 2019 | |
| */ | |
| #define CATCH_CONFIG_MAIN | |
| #include <catch.hpp> |
From Stack Overflow.
# Fetch the submodule commits into the main repository
git remote add submodule_origin git://url/to/submodule/origin
git fetch submodule_origin
# Start a fake merge (won't change any files, won't commit anything)
git merge -s ours --no-commit submodule_origin/master