Fix sync workflow merge identity handling#87
Merged
Conversation
Copilot
AI
changed the title
[WIP] Fix failing GitHub Actions job sync
Fix sync workflow merge identity handling
Jul 17, 2026
ToonCasteele
marked this pull request as ready for review
July 17, 2026 12:40
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.Problem
syncjob inPromote main to release candidatefailed while updating the promotion branch.git merge --no-editran without a configured committer identity, then the error path attemptedgit merge --aborteven when no merge state existed.Workflow change
automation/main-to-release-candidate.git merge --abortbehind aMERGE_HEADcheck so the conflict path is safe when merge creation never started.Versioning
DynamicsActivitiesPackage.csprojversion to1.8.94.VersionCommentto reflect the workflow fix.Relevant snippet