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

fix(v1.6.0): send review form from client for correction actions instead of register form #7604

Merged
merged 3 commits into from
Sep 19, 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 CHANGELOG.md
Auto-merging packages/client/src/declarations/submissionMiddleware.ts
CONFLICT (content): Merge conflict in packages/client/src/declarations/submissionMiddleware.ts
error: could not apply 6a1e59ed8... fix: send review form from client for correction actions instead of register form

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.6.0-7600-25837:auto-pr-release-v1.6.0-7600-25837
git fetch origin ocrvs-7583:ocrvs-7583

git checkout auto-pr-release-v1.6.0-7600-25837
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick 6a1e59ed8

@jamil314 jamil314 force-pushed the auto-pr-release-v1.6.0-7600-25837 branch from c1ccf78 to 788c633 Compare September 17, 2024 13:57
@Zangetsu101 Zangetsu101 merged commit 3bed61e into release-v1.6.0 Sep 19, 2024
21 of 22 checks passed
@Zangetsu101 Zangetsu101 deleted the auto-pr-release-v1.6.0-7600-25837 branch September 19, 2024 05:28
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