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 #7854 to release-v1.6.0 #7864

Merged
merged 2 commits into from
Oct 29, 2024

Conversation

ocrvs-bot
Copy link
Collaborator

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-pr-release-v1.6.0-7854-6580 6d00abc5f] fix: empty section handle in `fieldValueTransformer`
Author: tahmidrahman-dsi <tahmid.rahman@dsinnovators.com>
Date: Mon Oct 28 17:35:00 2024 +0600
1 file changed, 3 insertions(+)
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
error: could not apply 98be0dcc9... chore: update CHANGELOG.md

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.6.0-7854-6580:auto-pr-release-v1.6.0-7854-6580
git fetch origin ocrvs-5952:ocrvs-5952

git checkout auto-pr-release-v1.6.0-7854-6580
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick 46852b16f 98be0dcc9 41ea66b4b 20df551ea 8e159685a 8a9eeda71 5fc4a3688

@tahmidrahman-dsi tahmidrahman-dsi merged commit f1a0fe6 into release-v1.6.0 Oct 29, 2024
8 checks passed
@tahmidrahman-dsi tahmidrahman-dsi deleted the auto-pr-release-v1.6.0-7854-6580 branch October 29, 2024 12:48
@tahmidrahman-dsi tahmidrahman-dsi restored the auto-pr-release-v1.6.0-7854-6580 branch October 29, 2024 12:48
@tahmidrahman-dsi tahmidrahman-dsi deleted the auto-pr-release-v1.6.0-7854-6580 branch October 29, 2024 12:48
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