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 #1034 to #1067

Closed
wants to merge 1 commit into from

Conversation

github-actions[bot]
Copy link

Automated PR to merge changes from develop to

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

Auto-merging e2e/testcases/marriage/7-validate-witness-2-page.spec.ts
CONFLICT (content): Merge conflict in e2e/testcases/marriage/7-validate-witness-2-page.spec.ts
error: could not apply 4f186e36... Fixed broken tests

To continue manually you can use these commands:

git fetch origin auto-pr--1034-9025:auto-pr--1034-9025
git fetch origin e2e/validate-witness-2-details-page:e2e/validate-witness-2-details-page

git checkout auto-pr--1034-9025
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick cc3ca696c1dfb3626af0c5b8b66e6b5b6901c1d5..a6945f484bc4e0947fe32a41e8d2564e57586b87

@github-actions github-actions bot requested a review from Eezi July 29, 2024 08:19
@Zangetsu101 Zangetsu101 closed this Aug 1, 2024
@Zangetsu101 Zangetsu101 deleted the auto-pr--1034-9025 branch August 1, 2024 05:38
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