Skip to content

[7.0.1 Cherry-pick - CONFLICTS] Symbols Publishing Follow-up#4217

Closed
github-actions[bot] wants to merge 1 commit intorelease/7.0from
dev/automation/pr-4214-to-7.0.1
Closed

[7.0.1 Cherry-pick - CONFLICTS] Symbols Publishing Follow-up#4217
github-actions[bot] wants to merge 1 commit intorelease/7.0from
dev/automation/pr-4214-to-7.0.1

Conversation

@github-actions
Copy link
Copy Markdown

@github-actions github-actions Bot commented Apr 21, 2026

Cherry-pick of #4214 (8d2483b) into release/7.0 failed due to merge conflicts.

Please resolve manually:

git fetch origin
git checkout dev/automation/pr-4214-to-7.0.1\ngit cherry-pick 8d2483b9c9431c38f8fa71ebdad1bc85037ec5cc
# resolve conflicts
git push origin dev/automation/pr-4214-to-7.0.1 --force\n```

@github-actions
Cherry-pick of #4214 requires manual resolution
0ec15e9 
To resolve, run:  git cherry-pick 8d2483b
@github-actions github-actions Bot added this to the 7.0.1 milestone Apr 21, 2026
@github-project-automation github-project-automation Bot moved this to To triage in SqlClient Board Apr 21, 2026
@paulmedynski paulmedynski marked this pull request as draft April 21, 2026 11:10
@paulmedynski paulmedynski moved this from To triage to In progress in SqlClient Board Apr 21, 2026
@github-project-automation github-project-automation Bot moved this from In progress to Done in SqlClient Board Apr 21, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

SqlClient Board
Status: Done

Milestone

7.0.1

Development

Successfully merging this pull request may close these issues.

1 participant

@paulmedynski