Skip to content
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

Add prompt to fix conflict during backport #19583

Merged
merged 4 commits into from May 1, 2023

Conversation

TravisEz13
Copy link
Member

@TravisEz13 TravisEz13 commented Apr 27, 2023

PR Summary

  • Add prompt to fix conflict during backport
    • Add function to walk you through backporting all approved backports

PR Context

PR Checklist

@daxian-dbw daxian-dbw assigned TravisEz13 and unassigned daxian-dbw Apr 28, 2023
tools/releaseTools.psm1 Outdated Show resolved Hide resolved
TravisEz13 and others added 2 commits April 28, 2023 10:51
Co-authored-by: Dongbo Wang <dongbow@microsoft.com>
@daxian-dbw daxian-dbw added the CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log label May 1, 2023
Copy link
Member

@daxian-dbw daxian-dbw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@TravisEz13 TravisEz13 merged commit a634879 into PowerShell:master May 1, 2023
39 of 40 checks passed
@TravisEz13 TravisEz13 deleted the add-prompt-to-fix-conflict branch May 1, 2023 19:14
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>
@msftbot
Copy link

msftbot bot commented Jun 27, 2023

🎉v7.2.12 has been released which incorporates this pull request.🎉

Handy links:

@msftbot
Copy link

msftbot bot commented Jun 27, 2023

🎉v7.3.5 has been released which incorporates this pull request.🎉

Handy links:

@msftbot
Copy link

msftbot bot commented Jun 29, 2023

🎉v7.4.0-preview.4 has been released which incorporates this pull request.🎉

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-Approved CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants