◐ Shell
clean mode source ↗

Add merge conflict marker detection to linux-ci workflow and refactor existing actions to use reusable get-changed-files action by Copilot · Pull Request #26350 · PowerShell/PowerShell

Copilot

@TravisEz13 TravisEz13 added the CL-Tools

Indicates that a PR should be marked as a tools change in the Change Log

label

Oct 29, 2025

Copilot AI changed the title [WIP] Add GitHub workflow to check for merge conflict markers Add merge conflict marker detection to linux-ci workflow

Oct 29, 2025

TravisEz13

TravisEz13

TravisEz13

TravisEz13

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
… and add tests for its functionality

@TravisEz13

daxian-dbw

@TravisEz13 TravisEz13 deleted the copilot/add-github-workflow-merge-conflict-check branch

October 31, 2025 18:01

pwshBot pushed a commit to pwshBot/PowerShell that referenced this pull request

Oct 31, 2025

TravisEz13 added a commit to TravisEz13/PowerShell that referenced this pull request

Nov 25, 2025 
… existing actions to use reusable get-changed-files action (PowerShell#26350)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: TravisEz13 <10873629+TravisEz13@users.noreply.github.com>
Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Travis Plunk (HE/HIM) <tplunk@ntdev.microsoft.com>