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.5.1): amend updating signatures in client and workflow #7597

Merged
merged 9 commits into from
Sep 10, 2024

Conversation

ocrvs-bot
Copy link
Collaborator

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

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

[auto-pr-release-v1.5.1-7579-6125 57b332f0d] fix: update using review form instead of register form for different action
Author: Md. Ashikul Alam <[email protected]>
Date: Wed Sep 4 19:30:19 2024 +0600
3 files changed, 28 insertions(+), 11 deletions(-)
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
error: could not apply ab8eb3dc7... docs: update changelog(7462)

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.5.1-7579-6125:auto-pr-release-v1.5.1-7579-6125
git fetch origin ocrvs-7462:ocrvs-7462

git checkout auto-pr-release-v1.5.1-7579-6125
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick 3dae4df51 ab8eb3dc7 1e6fac2df 8265783d3 25eae2c95 c569ce42e 98822e8dc f58869ad3

@Nil20 Nil20 force-pushed the auto-pr-release-v1.5.1-7579-6125 branch from 2dca499 to 260ad63 Compare September 10, 2024 06:44
@Zangetsu101 Zangetsu101 merged commit 8da4810 into release-v1.5.1 Sep 10, 2024
20 of 21 checks passed
@Zangetsu101 Zangetsu101 deleted the auto-pr-release-v1.5.1-7579-6125 branch September 10, 2024 12:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants