admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed trailing whitespace (#3485)

Browse Source
This commit is contained in:
Travis Plunk
2017-04-11 09:44:43 -07:00
committed by Dongbo Wang
parent 18c28f8fc7
commit 68bcd4b528
14 changed files with 149 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/git/submodules.md
+6 -6
View File
@@ -1,7 +1,7 @@
Submodules
==========
While most developers will not have to deal with submodules on a regular basis, those who do should read this information.
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/Modules/Pester`: The Pester testing framework for PowerShell
@@ -16,13 +16,13 @@ Rebase and Fast-Forward Merge Pull Requests in Submodules
*This is not necessary in the superproject, only submodules!*
**DO NOT** commit updates unless absolutely necessary.
**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.
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,
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.