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 #8122 to release-v1.6.2 #8156

Closed
wants to merge 1 commit into from

Conversation

ocrvs-bot
Copy link
Collaborator

Automated PR to merge changes from develop to release-v1.6.2

I failed to cherry-pick the changes automatically because of the following:

Auto-merging packages/client/src/forms/register/mappings/mutation/field-mappings.ts
Auto-merging packages/client/src/forms/register/mappings/query/field-mappings.ts
Auto-merging packages/client/src/profile/mutations.ts
Auto-merging packages/client/src/search/advancedSearch/reducer.ts
Auto-merging packages/client/src/search/advancedSearch/utils.ts
Auto-merging packages/client/src/tests/schema.graphql
Auto-merging packages/gateway/src/features/bookmarkAdvancedSearch/schema.graphql
Auto-merging packages/gateway/src/graphql/schema.d.ts
CONFLICT (content): Merge conflict in packages/gateway/src/graphql/schema.d.ts
Auto-merging packages/gateway/src/graphql/schema.graphql
CONFLICT (content): Merge conflict in packages/gateway/src/graphql/schema.graphql
Auto-merging packages/metrics/src/features/metrics/metricsGenerator.ts
Auto-merging packages/search/src/features/search/types.ts
Auto-merging packages/user-mgnt/src/features/userSearchRecord/handler.ts
Auto-merging packages/user-mgnt/src/model/user.ts
error: could not apply 2ec5a787f... feat: Add 6th level support for addresses

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.6.2-8122-9109:auto-pr-release-v1.6.2-8122-9109
git fetch origin ocrvs-6956:ocrvs-6956

git checkout auto-pr-release-v1.6.2-8122-9109
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick 2ec5a787f

Copy link

github-actions bot commented Dec 4, 2024

Oops! Looks like you forgot to update the changelog. When updating CHANGELOG.md, please consider the following:

  • Changelog is read by country implementors who might not always be familiar with all technical details of OpenCRVS. Keep language high-level, user friendly and avoid technical references to internals.
  • Answer "What's new?", "Why was the change made?" and "Why should I care?" for each change.
  • If it's a breaking change, include a migration guide answering "What do I need to do to upgrade?".

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