Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Add prompt to fix conflict during backport#19583

Merged
TravisEz13 merged 4 commits into
PowerShell:masterPowerShell/PowerShell:masterfrom
TravisEz13:add-prompt-to-fix-conflictTravisEz13/PowerShell:add-prompt-to-fix-conflictCopy head branch name to clipboard
May 1, 2023
Merged

Add prompt to fix conflict during backport#19583
TravisEz13 merged 4 commits into
PowerShell:masterPowerShell/PowerShell:masterfrom
TravisEz13:add-prompt-to-fix-conflictTravisEz13/PowerShell:add-prompt-to-fix-conflictCopy head branch name to clipboard

Conversation

@TravisEz13

@TravisEz13 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
@daxian-dbw daxian-dbw assigned TravisEz13 and unassigned daxian-dbw Apr 28, 2023
Comment thread tools/releaseTools.psm1 Outdated
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

@daxian-dbw 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 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

ghost commented Jun 27, 2023

Copy link
Copy Markdown

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

Handy links:

@ghost

ghost commented Jun 27, 2023

Copy link
Copy Markdown

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

Handy links:

@ghost

ghost commented Jun 29, 2023

Copy link
Copy Markdown

🎉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

Morty Proxy This is a proxified and sanitized view of the page, visit original site.