Skip to content

Add prompt to fix conflict during backport - #19583

Merged
Travis Plunk (TravisEz13) merged 4 commits into
PowerShell:masterfrom
TravisEz13:add-prompt-to-fix-conflict
May 1, 2023
Merged

Travis Plunk (TravisEz13) merged 4 commits into
PowerShell:masterfrom
TravisEz13:add-prompt-to-fix-conflict

Conversation

@TravisEz13

@TravisEz13 Travis Plunk (TravisEz13) commented Apr 27, 2023 •

Copy link
Copy Markdown
Member

PR Summary

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

PR Context

PR Checklist

Comment thread tools/releaseTools.psm1 Resolved
Comment thread tools/releaseTools.psm1 Resolved
Co-authored-by: Dongbo Wang <dongbow@microsoft.com>
@daxian-dbw Dongbo Wang (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

@daxian-dbw Dongbo Wang (daxian-dbw) left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@TravisEz13
Travis Plunk (TravisEz13) merged commit a634879 into PowerShell:master May 1, 2023
@TravisEz13
Travis Plunk (TravisEz13) deleted the add-prompt-to-fix-conflict branch May 1, 2023 19:14
Aditya Patwardhan (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>
Aditya Patwardhan (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
Copy Markdown

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

Handy links:

@ghost

Copy link
Copy Markdown

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

Handy links:

@ghost

Copy link
Copy Markdown

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

Handy links:

Thatgfsj (Thatgfsj) pushed a commit to Thatgfsj-contribs/PowerShell that referenced this pull request Aug 6, 2026
* 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>
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