Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🍒 Merge changes from PR #7563 to release-v1.6.0 #7564

Merged
merged 1 commit into from
Sep 3, 2024

Conversation

ocrvs-bot
Copy link
Collaborator

Automated PR to merge changes from develop to release-v1.6.0

I failed to cherry-pick the changes automatically because of the following:

Auto-merging packages/client/src/views/RegisterForm/review/ReviewSection.tsx
CONFLICT (content): Merge conflict in packages/client/src/views/RegisterForm/review/ReviewSection.tsx
error: could not apply 4035263b0... hide signature in correction request mode

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.6.0-7563-23553:auto-pr-release-v1.6.0-7563-23553
git fetch origin ocrvs-7504:ocrvs-7504

git checkout auto-pr-release-v1.6.0-7563-23553
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick 4035263b0

@tareq89 tareq89 force-pushed the auto-pr-release-v1.6.0-7563-23553 branch from f218354 to 3141197 Compare September 2, 2024 14:53
@tareq89 tareq89 requested review from rikukissa and Zangetsu101 and removed request for tareq89 September 3, 2024 10:34
@tareq89 tareq89 merged commit eebe9b9 into release-v1.6.0 Sep 3, 2024
22 checks passed
@Zangetsu101 Zangetsu101 deleted the auto-pr-release-v1.6.0-7563-23553 branch September 3, 2024 11:46
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.

3 participants