PowerShell/docs/git/submodules.md
Travis Plunk 6ef94c1dfe
Make the experience better when start-pspester doesn't find pester (#5673)
refactor code to restore pester into a separate function called Restore-PSPester
update message on what to do when pester is missing
Add ability for get-psoptions to default to new-psoptions
fix an issue with publish-pstesttools when a build has not been run since build.psm1 has been imported (try to use the default options)
make start-pspester use the last build, not just use the default options
fix an issue in restore caused some files not to be removed
2017-12-12 16:07:12 -08:00

1.2 KiB

Submodules

While most developers will not have to deal with submodules on a regular basis, those who do should read this information. The submodules currently in this project are:

  • src/libpsl-native/test/googletest: The GoogleTest framework for Linux native code

Rebase and Fast-Forward Merge Pull Requests in Submodules

Note: This is not necessary in the superproject, only submodules!

DO NOT commit updates unless absolutely necessary. When submodules must be updated, a separate Pull Request must be submitted, reviewed, and merged before updating the superproject.

Because GitHub's "Merge Pull Request" button merges with --no-ff, an extra merge commit will always be created. This is especially annoying when trying to commit updates to submodules. Therefore our policy is to merge using the Git CLI after approval, with a rebase onto master to enable a fast-forward merge.

When committing submodule updates, ensure no other changes are in the same commit. Submodule bumps may be included in feature branches for ease of work, but the update must be independently approved before merging into master.