search

opencrvs / opencrvs-core

A global solution to civil registration
https://www.opencrvs.org
Other
79 stars 58 forks source link

fix(v1.5.0): missing heading in mobile view for duplicate #7217

Closed github-actions[bot] closed 1 week ago

github-actions[bot] commented 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-7210-14125 cb47d69e0] 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 packages/client/src/views/SearchResult/AdvancedSearch.tsx
Auto-merging packages/components/src/SearchTool/SearchTool.tsx
[auto-pr-release-v1.5.0-7210-14125 6654f4b79] removed 'declarationJurisdictionId' while calculating AdvancedSearchForm validity
 Author: Tareq <tareq.aziz@dsinnovators.com>
 Date: Mon Jun 10 20:21:50 2024 +0600
 2 files changed, 4 insertions(+), 3 deletions(-)
Auto-merging CHANGELOG.md
[auto-pr-release-v1.5.0-7210-14125 8db19cb49] 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 3e08c1419cd739788443f8e4de5e45ee6e06955a 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-7210-14125:auto-pr-release-v1.5.0-7210-14125
  git fetch origin ocrvs-7205-fix:ocrvs-7205-fix

  git checkout auto-pr-release-v1.5.0-7210-14125
  git reset --hard HEAD~1  # Remove placeholder commit
  git cherry-pick e86aee21a27e3ccdf99bfe4a438470bad6b73da0..bd43c7e3a1e8855167ea883eb05330197f515d8c