🍒 Merge changes from PR #244 to release-v1.6.0

[github-actions]

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

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

[auto-pr-release-v1.6.0-244-16719 afa92c17] Remove extra divider on Birth form's mother section
Author: Siyasanga <[email protected]>
Date: Tue Aug 6 15:12:35 2024 +0200
2 files changed, 2 insertions(+), 3 deletions(-)
[auto-pr-release-v1.6.0-244-16719 894e8009] Remove extra divider on Birth form's father section
Author: Siyasanga <[email protected]>
Date: Wed Aug 7 10:30:46 2024 +0200
2 files changed, 2 insertions(+), 3 deletions(-)
[auto-pr-release-v1.6.0-244-16719 5cf7c7d9] Remove extra divider on Death form's Spouse section
Author: Siyasanga <[email protected]>
Date: Wed Aug 7 10:46:32 2024 +0200
2 files changed, 2 insertions(+), 3 deletions(-)
[auto-pr-release-v1.6.0-244-16719 73996b14] Rm extra divider on Marriage form's placeOfMarriageTitle
Author: Siyasanga <[email protected]>
Date: Wed Aug 7 11:02:47 2024 +0200
2 files changed, 2 insertions(+), 3 deletions(-)
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
error: could not apply b3e694b7... Record the removing of dividers in CHANGELOG.md

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.6.0-244-16719:auto-pr-release-v1.6.0-244-16719
git fetch origin ocrvs-7404:ocrvs-7404

git checkout auto-pr-release-v1.6.0-244-16719
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick 6eb995eb ecfd0aa4 44addef5 7a5ec487 b3e694b7

[Zangetsu101]

@Siyasanga The auto cherry picking for the changes failed here. What you need to do is follow the instructions mentioned in the PR description to manually cherry-pick the commits and then resolve the conflicts

[Siyasanga]

@Zangetsu101 I'm struggling to run these command, could it be because I deleted the bug branch after I merged into develop? I think this was the reason for git fetch origin ocrvs-7404:ocrvs-7404 failing since it was trying to reference a deleted branch.

To try and rectify this, I restored the branch by pushing my local(ocrvs-7404) to origin/ocrvs-7404 but this command

git reset --hard HEAD~1  # Remove placeholder commit

Is failing, I'm not sure whether I was supposed to replace HEAD~1 with the placeholder-commit-hash for it to work.

From my understanding, which I'm not very confident about, is that we have a new branch(auto-pr-release-v1.6.0-244-16719) that was automatically created once my original PR with fixes was merged. This new automatically created branch has to have all the commits from my original PR(#244 ). Would it be correct if I just cherry-picked all the commit to this new branch then try to merge it into the 1.6.0 tagged release?

[Zangetsu101]

Would it be correct if I just cherry-picked all the commit to this new branch

Yes that is correct

[Siyasanga]

Thanks @Zangetsu101 I've cherry-picked the commits to this branch, but I don't have merge permissions

Can you please merge if you are also happy with the changes