Add merge conflict marker detection to linux-ci workflow and refactor existing actions to use reusable get-changed-files action#26350

Merged

TravisEz13 merged 26 commits into

masterfrom

copilot/add-github-workflow-merge-conflict-check

Oct 31, 2025

Commits on Oct 30, 2025

Initial plan

Copilot
authored and
TravisEz13
committed
Add merge conflict marker checker for pull requests

Copilot
and
TravisEz13
committed
Add merge_conflict_check to ready_to_merge and add test files

Copilot
and
TravisEz13
committed
Update .github/actions/infrastructure/merge-conflict-checker/action.yml

TravisEz13
and
Copilot
committed
Add repository owner check to merge_conflict_check job

Copilot
and
TravisEz13
committed
Fix pagination, regex pattern, add job summary with line numbers

Copilot
and
TravisEz13
committed
Move PowerShell logic from YAML to ci.psm1 module

Copilot
and
TravisEz13
committed
Fix code review issues: use Function, rename matches variable, simplify pagination, use relative paths

Copilot
and
TravisEz13
committed
Extract get-changed-files into reusable composite action

Copilot
and
TravisEz13
committed
Delete test/merge-conflict-markers/test-complete-conflict.txt
TravisEz13
committed
Delete test/merge-conflict-markers/test-end-marker.txt
TravisEz13
committed
Delete test/merge-conflict-markers/test-separator-marker.txt
TravisEz13
committed
Delete test/merge-conflict-markers directory
TravisEz13
committed
Update tools/ci.psm1

TravisEz13
and
Copilot
committed
Refactor to use Select-String, add pagination, fix JSON security issue

Copilot
and
TravisEz13
committed
Fix $matches variable naming and add automatic variables instruction

Copilot
and
TravisEz13
committed
Securely retrieve changed files using environment variable in markdown link verification and merge conflict checker actions
TravisEz13
committed
Apply suggestion from @TravisEz13
TravisEz13
authored
Add infrastructure tests for merge conflict detection
TravisEz13
committed
Update .github/workflows/linux-ci.yml

TravisEz13
and
Copilot
authored
Update tools/ci.psm1

TravisEz13
and
Copilot
authored
Add tests for Test-MergeConflictMarker function to validate conflict detection
TravisEz13
committed
Update Pester installation logic to check for existing version before installation
TravisEz13
committed
Remove Nanoserver CI template as it is no longer needed
TravisEz13
committed
Refactor Pester installation process to use Install-CIPester function and add tests for its functionality
TravisEz13
committed
Merge branch 'master' into copilot/add-github-workflow-merge-conflict-check
TravisEz13
authored

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add merge conflict marker detection to linux-ci workflow and refactor existing actions to use reusable get-changed-files action#26350

Add merge conflict marker detection to linux-ci workflow and refactor existing actions to use reusable get-changed-files action#26350
TravisEz13 merged 26 commits into
masterfrom
copilot/add-github-workflow-merge-conflict-check

Commits on Oct 30, 2025

Initial plan

Add merge conflict marker checker for pull requests

Add merge_conflict_check to ready_to_merge and add test files

Update .github/actions/infrastructure/merge-conflict-checker/action.yml

Add repository owner check to merge_conflict_check job

Fix pagination, regex pattern, add job summary with line numbers

Move PowerShell logic from YAML to ci.psm1 module

Fix code review issues: use Function, rename matches variable, simplify pagination, use relative paths

Extract get-changed-files into reusable composite action

Delete test/merge-conflict-markers/test-complete-conflict.txt

Delete test/merge-conflict-markers/test-end-marker.txt

Delete test/merge-conflict-markers/test-separator-marker.txt

Delete test/merge-conflict-markers directory

Update tools/ci.psm1

Refactor to use Select-String, add pagination, fix JSON security issue

Fix $matches variable naming and add automatic variables instruction

Securely retrieve changed files using environment variable in markdown link verification and merge conflict checker actions

Apply suggestion from @TravisEz13

Add infrastructure tests for merge conflict detection

Update .github/workflows/linux-ci.yml

Update tools/ci.psm1

Add tests for Test-MergeConflictMarker function to validate conflict detection

Update Pester installation logic to check for existing version before installation

Remove Nanoserver CI template as it is no longer needed

Refactor Pester installation process to use Install-CIPester function and add tests for its functionality

Merge branch 'master' into copilot/add-github-workflow-merge-conflict-check