Skip to content

Conversation

@ocrvs-bot
Copy link
Contributor

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

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

[auto-pr-release-v1.8.0-753-8130 10d1cf2b] Mk placeOfBirth field shows only acfive facilities
Author: Siyasanga <[email protected]>
Date: Wed May 21 10:33:21 2025 +0200
1 file changed, 1 insertion(+), 1 deletion(-)
[auto-pr-release-v1.8.0-753-8130 8d7fcc82] Ensure the placeOfDeath only show active facilities
Author: Siyasanga <[email protected]>
Date: Mon May 26 09:28:11 2025 +0200
1 file changed, 1 insertion(+), 1 deletion(-)
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
error: could not apply bc4897f8... Record PR changes to the CHANGELOG

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.8.0-753-8130:auto-pr-release-v1.8.0-753-8130
git fetch origin ocrvs-9311:ocrvs-9311

git checkout auto-pr-release-v1.8.0-753-8130
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick 909762a7be544eb12489a8e54530fe5dee98b598~..bc4897f824c9c84f5a1d2897c75df5baccddb8bd

Individual commits:

bc4897f8 Record PR changes to the CHANGELOG
c392134b Ensure the placeOfDeath only show active facilities
909762a7 Mk placeOfBirth field shows only acfive facilities

@github-actions

This comment has been minimized.

@Siyasanga Siyasanga force-pushed the auto-pr-release-v1.8.0-753-8130 branch from 3202af9 to 44bbef6 Compare June 4, 2025 18:01
@github-actions
Copy link
Contributor

This PR has been marked with label stale Since it has been inactive for 20 days. It will automatically be closed in 10 days if no further activity occurs.

@github-actions github-actions bot added the Stale PR is inactive for many days label Jun 25, 2025
@tahmidrahman-dsi
Copy link
Contributor

tahmidrahman-dsi commented Jul 8, 2025

@Siyasanga I think this can be skipped merging to v1.8.0 as the core change is not available in the release branch (v1.8.0).
https://github.com/opencrvs/opencrvs-core/blob/release-v1.8.0/packages/client/src/offline/reducer.ts#L579-L587
But only available in v1.6.5
https://github.com/opencrvs/opencrvs-core/blob/release-v1.6.5/packages/client/src/offline/reducer.ts#L595-L605
cc: @rikukissa

@Siyasanga
Copy link
Contributor

@Siyasanga I think this can be skipped merging to v1.8.0 as the core change is not available in the release branch (v1.8.0). https://github.com/opencrvs/opencrvs-core/blob/release-v1.8.0/packages/client/src/offline/reducer.ts#L579-L587 But only available in v1.6.5 https://github.com/opencrvs/opencrvs-core/blob/release-v1.6.5/packages/client/src/offline/reducer.ts#L595-L605 cc: @rikukissa

Yes no worries, I will close this PR

@Siyasanga Siyasanga closed this Jul 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Stale PR is inactive for many days

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants