Skip to content

Handle string literals in merge conflict regions #33914

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Oct 9, 2019
Merged

Handle string literals in merge conflict regions #33914

merged 1 commit into from
Oct 9, 2019

Conversation

amcasey
Copy link
Member

@amcasey amcasey commented Oct 9, 2019

Check for undefined, like the other code paths in the same function.

@amcasey
Handle string literals in merge conflict regions
87c905f 
Check for undefined, like the other code paths in the same function.
@amcasey
Copy link
Member Author

amcasey commented Oct 9, 2019

@RyanCavanaugh 3.7?

@amcasey amcasey merged commit 3c123b6 into microsoft:master Oct 9, 2019
@amcasey amcasey deleted the ConflictMarker branch October 9, 2019 23:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RyanCavanaugh RyanCavanaugh RyanCavanaugh approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@amcasey @RyanCavanaugh