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 #354 to release-v1.6.2 #368

Closed
wants to merge 1 commit into from

Conversation

ocrvs-bot
Copy link
Collaborator

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

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

Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
Auto-merging src/api/application/application-config.ts
error: could not apply 1e797058... INFORMANT_SIGNATURE & INFORMANT_SIGNATURE_REQUIRED are now deprecated

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.6.2-354-9598:auto-pr-release-v1.6.2-354-9598
git fetch origin 8228-deprecate-signature-related-feature-flags:8228-deprecate-signature-related-feature-flags

git checkout auto-pr-release-v1.6.2-354-9598
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick 1e797058

@Zangetsu101
Copy link
Collaborator

Closing this as v1.6.2 has already been released

@Zangetsu101 Zangetsu101 deleted the auto-pr-release-v1.6.2-354-9598 branch January 21, 2025 04:52
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