Closed github-actions[bot] closed 1 week ago
Automated PR to merge changes from develop to release-v1.5.0
I failed to cherry-pick the changes automatically because of the following:
Auto-merging packages/user-mgnt/src/features/userSearchRecord/handler.ts [auto-pr-release-v1.5.0-7212-13715 e7f64abed] fix: allow correction requested reg status for search request Author: Md. Ashikul Alam <ashikul.alam@dsinnovators.com> Date: Mon Jun 10 16:08:03 2024 +0600 1 file changed, 4 insertions(+), 2 deletions(-) Auto-merging CHANGELOG.md [auto-pr-release-v1.5.0-7212-13715 0f7966201] docs: update changelog(7110) Author: Md. Ashikul Alam <ashikul.alam@dsinnovators.com> Date: Fri Jun 14 15:59:16 2024 +0600 1 file changed, 1 insertion(+) error: commit 8ca11ecc605135a4f3e2c131a3b88add41437d9f is a merge but no -m option was given. fatal: cherry-pick failed
To continue manually you can use these commands:
git fetch origin auto-pr-release-v1.5.0-7212-13715:auto-pr-release-v1.5.0-7212-13715 git fetch origin ocrvs-7207-fix:ocrvs-7207-fix git checkout auto-pr-release-v1.5.0-7212-13715 git reset --hard HEAD~1 # Remove placeholder commit git cherry-pick d2b1d95422a74908a3c018d8f0ff7f026ba2908a..dc332727b4fa6762fb30eb5c4b668c601949e312
closing in favor of #7221
Automated PR to merge changes from develop to release-v1.5.0
I failed to cherry-pick the changes automatically because of the following:
To continue manually you can use these commands: