Update upmerge workflow to ignore config and body-end changes #1267
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.
Thank you for helping make the Radius documentation better!
Please follow this checklist before submitting:
In addition, please fill out the following to help reviewers understand this pull request:
Description
We ignore certain files in the upmerge workflow that shouldn't get overwritten in edge. This was previously broken because we weren't resetting to the changes on edge. Instead, we were resetting to the changes after the merge.
Test run: https://github.com/sk593/radius-docs/actions/runs/11728935169/job/32673463501
Test branch with config/body-end changes: https://github.com/sk593/radius-docs/pull/3/files
Test PR opened from upmerge workflow (with no config/body-end changes): sk593#2
Issue reference