-
Notifications
You must be signed in to change notification settings - Fork 8.1k
Add prompt to fix conflict during backport #19583
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
TravisEz13
merged 4 commits into
PowerShell:master
from
TravisEz13:add-prompt-to-fix-conflict
May 1, 2023
Merged
Add prompt to fix conflict during backport #19583
TravisEz13
merged 4 commits into
PowerShell:master
from
TravisEz13:add-prompt-to-fix-conflict
May 1, 2023
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TravisEz13
commented
Apr 27, 2023
daxian-dbw
reviewed
Apr 28, 2023
Co-authored-by: Dongbo Wang <dongbow@microsoft.com>
daxian-dbw
approved these changes
May 1, 2023
Member
daxian-dbw
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
adityapatwardhan
pushed a commit
that referenced
this pull request
Jun 14, 2023
* Add prompt to fix conflicts * Add function to backport all approved PRs * Update tools/releaseTools.psm1 Co-authored-by: Dongbo Wang <dongbow@microsoft.com> * Update tools/releaseTools.psm1 --------- Co-authored-by: Dongbo Wang <dongbow@microsoft.com>
adityapatwardhan
pushed a commit
that referenced
this pull request
Jun 14, 2023
* Add prompt to fix conflicts * Add function to backport all approved PRs * Update tools/releaseTools.psm1 Co-authored-by: Dongbo Wang <dongbow@microsoft.com> * Update tools/releaseTools.psm1 --------- Co-authored-by: Dongbo Wang <dongbow@microsoft.com>
|
🎉 Handy links: |
|
🎉 Handy links: |
|
🎉 Handy links: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Backport-7.2.x-Done
Backport-7.3.x-Done
CL-BuildPackaging
Indicates that a PR should be marked as a build or packaging change in the Change Log
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR Summary
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).