Skip to content

Conversation

@ocrvs-bot
Copy link
Contributor

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 src/form/common/default-validation-conditionals.ts
[auto-pr-release-v1.6.1-334-243 39c9ebd5] fix: use form data to check if details exist
Author: Tameem Bin Haider <[email protected]>
Date: Tue Dec 3 15:07:49 2024 +0600
2 files changed, 9 insertions(+), 20 deletions(-)
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
error: could not apply 6af6c002... docs: update CHANGELOG

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.6.1-334-243:auto-pr-release-v1.6.1-334-243
git fetch origin update-details-exists-conditionals:update-details-exists-conditionals

git checkout auto-pr-release-v1.6.1-334-243
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick 5a83b8fb 6af6c002

@Zangetsu101 Zangetsu101 force-pushed the auto-pr-release-v1.6.1-334-243 branch from 0cbd3df to f45635c Compare December 5, 2024 11:59
@Zangetsu101 Zangetsu101 merged commit 41d71ee into release-v1.6.1 Dec 5, 2024
1 check passed
@Zangetsu101 Zangetsu101 deleted the auto-pr-release-v1.6.1-334-243 branch December 5, 2024 12:04
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