Skip to content

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
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
@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>
@ghost
Copy link

ghost commented Jun 27, 2023

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

Handy links:

@ghost
Copy link

ghost commented Jun 27, 2023

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

Handy links:

@ghost
Copy link

ghost commented Jun 29, 2023

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

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants