-
Notifications
You must be signed in to change notification settings - Fork 0
Closed
Labels
cherry-pickCherry-picked changesCherry-picked changesconflictHas conflictsHas conflictsneeds-attentionNeeds attentionNeeds attention
Description
Manual Cherry-pick Required
The automatic cherry-pick of #36 to main failed due to merge conflicts.
Original PR
- PR: chore: update package versions to 2.8.0 and adjust dependency tags #36
- Title: chore: update package versions to 2.8.0 and adjust dependency tags
- Author: @frontegg-david
- Merged to:
release/2.8.x - Commit:
be4e7ade8faa1edf58f84c2ec732e942af23f24a
Manual Cherry-pick Instructions
# Checkout main branch
git checkout main
git pull origin main
# Create a new branch for the cherry-pick
git checkout -b cherry-pick-pr-36
# Cherry-pick the commit (use -m 1 for merge commits)
git cherry-pick be4e7ade8faa1edf58f84c2ec732e942af23f24a
# OR for merge commits:
# git cherry-pick -m 1 be4e7ade8faa1edf58f84c2ec732e942af23f24a
# Resolve conflicts manually, then:
git add .
git cherry-pick --continue
# Push and create PR
git push origin cherry-pick-pr-36
gh pr create --base main --title "Cherry-pick: chore: update package versions to 2.8.0 and adjust dependency tags"Decision Required
- Cherry-pick is needed - resolve conflicts and apply
- Cherry-pick is NOT needed - close this issue
This issue was automatically created by the cherry-pick workflow.
Reactions are currently unavailable
Metadata
Metadata
Assignees
Labels
cherry-pickCherry-picked changesCherry-picked changesconflictHas conflictsHas conflictsneeds-attentionNeeds attentionNeeds attention