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

resolve merge conflict when rce-main rebase from main #14149

Merged
merged 2 commits into from
Nov 19, 2024

Conversation

Xiaoshouzi-gh
Copy link
Contributor

Hey there! So you want to contribute to a Firebase SDK?
Before you file this pull request, please read these guidelines:

Discussion

  • Read the contribution guidelines (CONTRIBUTING.md).
  • If this has been discussed in an issue, make sure to link to the issue here.
    If not, go file an issue about this before creating a pull request to discuss.

Testing

  • Make sure all existing tests in the repository pass after your change.
  • If you fixed a bug or added a feature, add a new test to cover your code.

API Changes

  • At this time we cannot accept changes that affect the public API. If you'd like to help
    us make Firebase APIs better, please propose your change in a feature request so that we
    can discuss it together.

@google-oss-bot
Copy link

1 Warning
⚠️ Did you forget to add a changelog entry? (Add #no-changelog to the PR description to silence this warning.)

Generated by 🚫 Danger

@Xiaoshouzi-gh Xiaoshouzi-gh changed the title S resolve merge conflict when rce-main rebase from main Nov 19, 2024
@Xiaoshouzi-gh Xiaoshouzi-gh marked this pull request as ready for review November 19, 2024 19:48
@@ -818,7 +818,7 @@
}
}

class FakeAuthRecaptchaVerifier: AuthRecaptchaVerifier {
class FakeAuthRecaptchaVerifier: AuthRecaptchaVerifier, @unchecked Sendable {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks okay for now since it's test code. What prompted this to be added though?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI failed for this asking to restate from sendable

@Xiaoshouzi-gh Xiaoshouzi-gh merged commit a6115f9 into rce-main Nov 19, 2024
51 checks passed
@Xiaoshouzi-gh Xiaoshouzi-gh deleted the rce-test-fix branch November 19, 2024 19:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants