Use dedicated branch for promotion conflict resolution#83
Merged
Conversation
Copilot created this pull request from a session on behalf of
ToonCasteele
July 17, 2026 11:53
View session
ToonCasteele
marked this pull request as ready for review
July 17, 2026 11:53
Contributor
There was a problem hiding this comment.
Pull request overview
Updates the main → release-candidate promotion workflow to use a dedicated head branch, so conflict resolution commits can be pushed without modifying main.
Changes:
- Adjusts the promotion workflow to open the PR from
automation/main-to-release-candidate(instead ofmain) and to re-trigger on PR synchronization. - Updates documentation to reflect the dedicated promotion branch approach.
- Bumps the package version and version comment.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| README.md | Updates the workflow description to document the dedicated promotion branch behavior. |
| DynamicsActivitiesPackage/DynamicsActivitiesPackage/DynamicsActivitiesPackage.csproj | Increments package version and updates the version comment for this PR. |
| .github/workflows/promote-main-to-release-candidate.yml | Creates/uses a dedicated promotion branch and re-triggers on promotion PR updates to support conflict resolution on that branch. |
Comment on lines
+35
to
39
| promotion_branch="automation/main-to-release-candidate" | ||
| pr_number="$(gh pr list \ | ||
| --base release-candidate \ | ||
| --head main \ | ||
| --head "$promotion_branch" \ | ||
| --state open \ |
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Target branch
release-candidate.main.Use the base selector on the pull request page before opening the PR. Promote the complete release candidate with a separate
release-candidatetomainpull request.automation/main-to-release-candidateinstead ofmain.