Skip to content

Alert presenting vc master #920

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

Merged
merged 3 commits into from
Dec 17, 2021

Conversation

HeyImChris
Copy link

Please select one of the following

  • I am removing an existing difference between facebook/react-native and microsoft/react-native-macos 👍
  • I am cherry-picking a change from Facebook's react-native into microsoft/react-native-macos 👍
  • I am making a fix / change for the macOS implementation of react-native
  • I am making a change required for Microsoft usage of react-native

Summary

Pull in a 0.64-stable fix to master

git cherry-pick b7752ec

Changelog

[Bug] [macOS] - Cherry pick alert fix

Test Plan

Tested in downstream app when it was opened in 0.64-stable branch

@HeyImChris HeyImChris requested a review from alloy as a code owner December 2, 2021 18:02
@HeyImChris HeyImChris requested a review from amgleitman December 2, 2021 18:03
@HeyImChris
Copy link
Author

It looks like a bunch of Android files had line endings that VSCode on my Mac doesn't agree with. Probably fair to fix up those line endings too so these files stop showing up as "changed" on other peoples' machines.

@@ -1,27 +1,27 @@
@if "%DEBUG%" == "" @echo off
Copy link
Collaborator

Choose a reason for hiding this comment

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

unintentional change?

Copy link
Author

Choose a reason for hiding this comment

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

I mentioned this in another comment on the review. I think VSCode on Mac didn't like the current line endings. I can just fix them up now since they're already on my machine

@@ -1,89 +1,89 @@
@rem
Copy link
Collaborator

Choose a reason for hiding this comment

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

And this one

Copy link
Author

Choose a reason for hiding this comment

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

I mentioned this in another comment on the review. I think VSCode on Mac didn't like the current line endings. I can just fix them up now since they're already on my machine

@pull-bot
Copy link

pull-bot commented Dec 2, 2021

Messages
📖

📋 Verify Changelog Format - A changelog entry has the following format: [CATEGORY] [TYPE] - Message.

CATEGORY may be:
  • General
  • macOS
  • iOS
  • Android
  • JavaScript
  • Internal (for changes that do not need to be called out in the release notes)

TYPE may be:

  • Added, for new features.
  • Changed, for changes in existing functionality.
  • Deprecated, for soon-to-be removed features.
  • Removed, for now removed features.
  • Fixed, for any bug fixes.
  • Security, in case of vulnerabilities.

MESSAGE may answer "what and why" on a feature level. Use this to briefly tell React Native users about notable changes.

Generated by 🚫 dangerJS against bfaa932

@HeyImChris HeyImChris merged commit 2edd56e into microsoft:master Dec 17, 2021
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.

4 participants