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

feat(v1.6.0): enable conditional filtering in document select options #263

Merged
merged 2 commits into from
Sep 12, 2024

Conversation

github-actions[bot]
Copy link

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 src/form/types/types.ts
[auto-pr-release-v1.6.0-254-6976 3c117db6] feat: optionCondition to filter document select options
Author: Tameem Bin Haider <[email protected]>
Date: Mon Sep 2 15:08:04 2024 +0600
1 file changed, 1 insertion(+)
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
error: could not apply ca8881a9... docs: update changelog

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.6.0-254-6976:auto-pr-release-v1.6.0-254-6976
git fetch origin filter-options-in-document-select:filter-options-in-document-select

git checkout auto-pr-release-v1.6.0-254-6976
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick 6375dc05 ca8881a9

@Zangetsu101 Zangetsu101 merged commit 4472504 into release-v1.6.0 Sep 12, 2024
1 check passed
@Zangetsu101 Zangetsu101 deleted the auto-pr-release-v1.6.0-254-6976 branch September 12, 2024 09:09
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.

1 participant