Update list of PS team members in release tools#17909
Update list of PS team members in release tools#17909daxian-dbw merged 2 commits intoPowerShell:masterfrom
Conversation
|
This PR has Quantification details
Why proper sizing of changes matters
Optimal pull request sizes drive a better predictable PR flow as they strike a
What can I do to optimize my changes
How to interpret the change counts in git diff output
Was this comment helpful? 👍 :ok_hand: :thumbsdown: (Email) |
|
/backport to release/v7.3.0-rc.1 |
|
/backport to release/v7.2.7 |
|
/backport to release/v7.0.12 |
|
@TravisEz13 backporting to release/v7.0.12 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Update list of PS team members in release tools
Using index info to reconstruct a base tree...
M tools/releaseTools.psm1
Falling back to patching base and 3-way merge...
Auto-merging tools/releaseTools.psm1
CONFLICT (content): Merge conflict in tools/releaseTools.psm1
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update list of PS team members in release tools
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
🎉 Handy links: |
PR Summary
Adding myself to release tools so the release notes don't sing my praises. Also removing some folks who have since left the team.
PR Context
PR Checklist
.h,.cpp,.cs,.ps1and.psm1files have the correct copyright headerWIP:or[ WIP ]to the beginning of the title (theWIPbot will keep its status check atPendingwhile the prefix is present) and remove the prefix when the PR is ready.(which runs in a different PS Host).