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 #7469 to release-v1.6.0 #7483

Merged
merged 4 commits into from
Sep 17, 2024

Conversation

github-actions[bot]
Copy link

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

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

usage: git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]
                     [-S[<keyid>]] <commit>...
 or: git cherry-pick (--continue | --skip | --abort | --quit)

  --quit                end revert or cherry-pick sequence
  --continue            resume revert or cherry-pick sequence
  --abort               cancel revert or cherry-pick sequence
  --skip                skip current commit and continue
  --[no-]cleanup <mode> how to strip spaces and #comments from message
  -n, --no-commit       don't automatically commit
  --commit              opposite of --no-commit
  -e, --[no-]edit       edit the commit message
  -s, --[no-]signoff    add a Signed-off-by trailer
  -m, --[no-]mainline <parent-number>
                        select mainline parent
  --[no-]rerere-autoupdate
                        update the index with reused conflict resolution if possible
  --[no-]strategy <strategy>
                        merge strategy
  -X, --[no-]strategy-option <option>
                        option for merge strategy
  -S, --[no-]gpg-sign[=<key-id>]
                        GPG sign commit
  -x                    append commit name
  --[no-]ff             allow fast-forward
  --[no-]allow-empty    preserve initially empty commits
  --[no-]allow-empty-message
                        allow commits with empty messages
  --[no-]keep-redundant-commits
                        deprecated: use --empty=keep instead
  --empty (stop|drop|keep)
                        how to handle commits that become empty

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.6.0-7469-27871:auto-pr-release-v1.6.0-7469-27871
git fetch origin add-child-identifier-in-view-gql-query:add-child-identifier-in-view-gql-query

git checkout auto-pr-release-v1.6.0-7469-27871
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick 

* chore: add child identifier in view birth record query

* Update CHANGELOG.md

* chore: update CHANGELOG.md to add this change under v1.6.0
@tahmidrahman-dsi tahmidrahman-dsi force-pushed the auto-pr-release-v1.6.0-7469-27871 branch from 9baccb8 to ecbf577 Compare August 15, 2024 12:49
@tahmidrahman-dsi tahmidrahman-dsi changed the title chore(v1.6.0): chore:addchildidentifierinviewbirthrecordquery 🍒 Merge changes from PR #7469 to release-v1.6.0 Aug 15, 2024
@Zangetsu101 Zangetsu101 merged commit 83adb02 into release-v1.6.0 Sep 17, 2024
21 of 22 checks passed
@Zangetsu101 Zangetsu101 deleted the auto-pr-release-v1.6.0-7469-27871 branch September 17, 2024 09:43
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