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): amend date of certification for verifying certificate #7218

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/client/src/views/VerifyCertificate/VerifyCertificatePage.tsx
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'
On branch auto-pr-release-v1.5.0-7098-27015
You are currently cherry-picking commit 56178e670.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

To continue manually you can use these commands:

  git fetch origin auto-pr-release-v1.5.0-7098-27015:auto-pr-release-v1.5.0-7098-27015
  git fetch origin ocrvs-7064:ocrvs-7064

  git checkout auto-pr-release-v1.5.0-7098-27015
  git reset --hard HEAD~1  # Remove placeholder commit
  git cherry-pick 785a85bd85f44996520feee9e960ab2a2fcc5c5f..5e64ffb35688244fddbb3500f4ab5d1abb17a16b