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 #8044 to release-v1.6.1 #8065

Merged
merged 4 commits into from
Nov 26, 2024

Conversation

ocrvs-bot
Copy link
Collaborator

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

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

Auto-merging packages/client/src/forms/index.ts
Auto-merging packages/client/src/views/RegisterForm/RegisterForm.tsx
[auto-pr-release-v1.6.1-8044-22311 5ecc1c3f7] feat: disable continue button conditionally on a loading value
Author: tahmidrahman-dsi <tahmid.rahman@dsinnovators.com>
Date: Thu Nov 21 23:17:06 2024 +0600
2 files changed, 19 insertions(+), 3 deletions(-)
Auto-merging packages/client/src/forms/index.ts
[auto-pr-release-v1.6.1-8044-22311 cbe8bc348] chore: add a small comment on why we needed this
Author: tahmidrahman-dsi <tahmid.rahman@dsinnovators.com>
Date: Thu Nov 21 23:25:22 2024 +0600
1 file changed, 7 insertions(+)
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
error: could not apply 254a16b2d... chore: update CHANGELOG.md

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.6.1-8044-22311:auto-pr-release-v1.6.1-8044-22311
git fetch origin disable-continue-on-async:disable-continue-on-async

git checkout auto-pr-release-v1.6.1-8044-22311
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick 0708ed2c3 c3f34ea34 254a16b2d

This comment has been minimized.

@tahmidrahman-dsi tahmidrahman-dsi force-pushed the auto-pr-release-v1.6.1-8044-22311 branch from 16ace69 to 8e5c3ee Compare November 25, 2024 12:29
@tahmidrahman-dsi tahmidrahman-dsi force-pushed the auto-pr-release-v1.6.1-8044-22311 branch from 8e5c3ee to 718e6a9 Compare November 25, 2024 12:38
@tahmidrahman-dsi tahmidrahman-dsi merged commit 2cf2a65 into release-v1.6.1 Nov 26, 2024
45 of 60 checks passed
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.

2 participants