Skip to content

Fix sync workflow merge identity handling#87

Merged
ToonCasteele merged 2 commits into
mainfrom
copilot/fix-sync-job-failure-another-one
Jul 17, 2026
Merged

Fix sync workflow merge identity handling#87
ToonCasteele merged 2 commits into
mainfrom
copilot/fix-sync-job-failure-another-one

Conversation

Copilot AI commented Jul 17, 2026

Copy link
Copy Markdown
Contributor

Target branch

  • This PR creates, updates, or deletes Dataverse data and targets release-candidate.
  • This PR is read-only and targets main.

Use the base selector on the pull request page before opening the PR. Promote the complete release candidate with a separate release-candidate to main pull request.

  • Problem

    • The sync job in Promote main to release candidate failed while updating the promotion branch.
    • git merge --no-edit ran without a configured committer identity, then the error path attempted git merge --abort even when no merge state existed.
  • Workflow change

    • Configure a local Git identity before merging on automation/main-to-release-candidate.
    • Guard git merge --abort behind a MERGE_HEAD check so the conflict path is safe when merge creation never started.
  • Versioning

    • Bump DynamicsActivitiesPackage.csproj version to 1.8.94.
    • Update VersionComment to reflect the workflow fix.
  • Relevant snippet

    git config user.name "github-actions[bot]"
    git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
    
    if git rev-parse -q --verify MERGE_HEAD >/dev/null; then
      git merge --abort
    fi

Copilot AI changed the title [WIP] Fix failing GitHub Actions job sync Fix sync workflow merge identity handling Jul 17, 2026
Copilot AI requested a review from ToonCasteele July 17, 2026 12:40
@ToonCasteele
ToonCasteele marked this pull request as ready for review July 17, 2026 12:40
@ToonCasteele
ToonCasteele merged commit 3d79bd4 into main Jul 17, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants