GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — Add prompt to fix conflict during backport by TravisEz13 · Pull Request #19583 · PowerShell/PowerShell

Conversation

@TravisEz13

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

Uh oh!

There was an error while loading. Please reload this page.

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

  • PR has a meaningful title
    • Use the present tense and imperative mood when describing your changes
  • Summarized changes
  • Make sure all .h, .cpp, .cs, .ps1 and .psm1 files have the correct copyright header
  • This PR is ready to merge and is not Work in Progress.
    • If the PR is work in progress, please add the prefix WIP: or [ WIP ] to the beginning of the title (the WIP bot will keep its status check at Pending while the prefix is present) and remove the prefix when the PR is ready.
  • Breaking changes
    • None
    • OR
    • Experimental feature(s) needed
      • Experimental feature name(s):
  • User-facing changes
    • Not Applicable
    • OR
    • Documentation needed
      • Issue filed:
  • Testing - New and feature
    • N/A or can only be tested interactively
    • OR
    • Make sure you've added a new test if existing tests do not effectively test the code changed
  • Tooling
    • I have considered the user experience from a tooling perspective and don't believe tooling will be impacted.
    • OR
    • I have considered the user experience from a tooling perspective and opened an issue in the relevant tool repository. This may include:
      • Impact on PowerShell Editor Services which is used in the PowerShell extension for VSCode
        (which runs in a different PS Host).
        • Issue filed:
      • Impact on Completions (both in the console and in editors) - one of PowerShell's most powerful features.
        • Issue filed:
      • Impact on PSScriptAnalyzer (which provides linting & formatting in the editor extensions).
        • Issue filed:
      • Impact on EditorSyntax (which provides syntax highlighting with in VSCode, GitHub, and many other editors).
        • Issue filed:

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
Travis Plunk (TravisEz13) added 2 commits April 26, 2023 11:08
@TravisEz13
Add prompt to fix conflicts
e778c85
@TravisEz13
Add function to backport all approved PRs
745e608
@TravisEz13
Travis Plunk (TravisEz13) requested review from Paul Higinbotham (PaulHigin), Aditya Patwardhan (adityapatwardhan), Andrew (anmenaga) and Dongbo Wang (daxian-dbw) as code owners April 27, 2023 17:49
@ghost ghost assigned Dongbo Wang (daxian-dbw) Apr 27, 2023
@TravisEz13 Travis Plunk (TravisEz13) added Backport-7.2.x-Consider labels Apr 27, 2023
TravisEz13
Travis Plunk (TravisEz13) commented Apr 27, 2023
View reviewed changes
Comment thread tools/releaseTools.psm1 Resolved

Uh oh!

There was an error while loading. Please reload this page.

@daxian-dbw Dongbo Wang (daxian-dbw) assigned Travis Plunk (TravisEz13) and unassigned Dongbo Wang (daxian-dbw) Apr 28, 2023
daxian-dbw
Dongbo Wang (daxian-dbw) reviewed Apr 28, 2023
View reviewed changes
Comment thread tools/releaseTools.psm1 Resolved

Uh oh!

There was an error while loading. Please reload this page.

Travis Plunk (TravisEz13) and others added 2 commits April 28, 2023 10:51
@TravisEz13 @daxian-dbw
Update tools/releaseTools.psm1
d15d90f
Co-authored-by: Dongbo Wang <[email protected]>
@TravisEz13
Update tools/releaseTools.psm1
fcf3fb6
@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) approved these changes May 1, 2023
View reviewed changes

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

Copy link
Copy Markdown
Member

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

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
@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
@adityapatwardhan Aditya Patwardhan (adityapatwardhan) added Backport-7.2.x-Approved and removed Backport-7.2.x-Consider labels May 26, 2023
@adityapatwardhan Aditya Patwardhan (adityapatwardhan) added Backport-7.2.x-Done and removed Backport-7.2.x-Approved labels Jun 14, 2023
Aditya Patwardhan (adityapatwardhan) pushed a commit that referenced this pull request Jun 14, 2023
@TravisEz13 @daxian-dbw @adityapatwardhan
Add prompt to fix conflict during backport (#19583)
081dff0
* Add prompt to fix conflicts

* Add function to backport all approved PRs

* Update tools/releaseTools.psm1

Co-authored-by: Dongbo Wang <[email protected]>

* Update tools/releaseTools.psm1

---------

Co-authored-by: Dongbo Wang <[email protected]>
Aditya Patwardhan (adityapatwardhan) pushed a commit that referenced this pull request Jun 14, 2023
@TravisEz13 @daxian-dbw @adityapatwardhan
Add prompt to fix conflict during backport (#19583)
2af69ae
* Add prompt to fix conflicts

* Add function to backport all approved PRs

* Update tools/releaseTools.psm1

Co-authored-by: Dongbo Wang <[email protected]>

* Update tools/releaseTools.psm1

---------

Co-authored-by: Dongbo Wang <[email protected]>
@ghost

Deleted user (ghost) commented Jun 27, 2023

Copy link
Copy Markdown

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

Handy links:

  • Release Notes
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@ghost

Deleted user (ghost) commented Jun 27, 2023

Copy link
Copy Markdown

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

Handy links:

  • Release Notes
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@ghost

Deleted user (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:

  • Release Notes
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@TravisEz13 Travis Plunk (TravisEz13) added Backport-7.3.x-Done and removed Backport-7.3.x-Approved labels Jul 12, 2023
@TravisEz13 Travis Plunk (TravisEz13) mentioned this pull request Apr 16, 2024
WIP: add more detail to suspicious scriptblock logging #21475
Closed
@TravisEz13 Travis Plunk (TravisEz13) mentioned this pull request Jul 9, 2024
Add script to update SDK for release branches #24034
Merged
Thatgfsj (Thatgfsj) pushed a commit to Thatgfsj-contribs/PowerShell that referenced this pull request Aug 6, 2026
@TravisEz13 @daxian-dbw
Add prompt to fix conflict during backport (PowerShell#19583)
4cb66d8
* Add prompt to fix conflicts

* Add function to backport all approved PRs

* Update tools/releaseTools.psm1

Co-authored-by: Dongbo Wang <[email protected]>

* Update tools/releaseTools.psm1

---------

Co-authored-by: Dongbo Wang <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@daxian-dbw Dongbo Wang (daxian-dbw) daxian-dbw approved these changes
@adityapatwardhan Aditya Patwardhan (adityapatwardhan) Awaiting requested review from adityapatwardhan
@anmenaga Andrew (anmenaga) Awaiting requested review from anmenaga
@PaulHigin Paul Higinbotham (PaulHigin) Awaiting requested review from PaulHigin

Uh oh!

There was an error while loading. Please reload this page.

Assignees

@TravisEz13 Travis Plunk (TravisEz13)

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

3 participants

@TravisEz13 @daxian-dbw @adityapatwardhan
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.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.