Skip to content

Add support for diff3-style merge #16135

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 2 commits into from
May 30, 2017
Merged

Add support for diff3-style merge #16135

merged 2 commits into from
May 30, 2017

Conversation

katemihalikova
Copy link
Contributor

Fixes #16129

@msftclas
Copy link

@katemihalikova,
Thanks for having already signed the Contribution License Agreement. Your agreement has not been validated yet. We will now review your pull request.
Thanks,
Microsoft Pull Request Bot

alfaproject
alfaproject reviewed May 30, 2017
View reviewed changes
src/compiler/scanner.ts
@@ -429,6 +429,7 @@ namespace ts {
case CharacterCodes.slash:
// starts of normal trivia
case CharacterCodes.lessThan:
case CharacterCodes.bar:
Copy link

Choose a reason for hiding this comment

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

It's actually called pipe pretty much everywhere

Copy link
Member

Choose a reason for hiding this comment

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

@alfaproject can you open a separate issue or PR for this? This PR doesn't change the CharacterCodes enum.

Copy link
Member

Choose a reason for hiding this comment

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

Please don't open a PR - we already consistently use bar and Bar throughout the codebase.

Copy link
Member

Choose a reason for hiding this comment

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

From further discussion with @DanielRosenwasser, it would change the public API since SyntaxKind would also need to change. So I think we should just live with bar.

@mhegazy mhegazy requested a review from sandersn May 30, 2017 17:57
@mhegazy
Copy link
Contributor

mhegazy commented May 30, 2017

@sandersn can you please review this change

@sandersn sandersn merged commit 2c3c4dd into microsoft:master May 30, 2017
@sandersn
Copy link
Member

Thanks @katemihalikova !

@katemihalikova katemihalikova deleted the diff3 branch May 30, 2017 18:35
@renovate-bot renovate-bot mentioned this pull request May 30, 2017
Merged
@microsoft microsoft locked and limited conversation to collaborators Jun 14, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@alfaproject alfaproject alfaproject left review comments

@DanielRosenwasser DanielRosenwasser DanielRosenwasser left review comments

@sandersn sandersn sandersn 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.
6 participants
@katemihalikova @msftclas @mhegazy @sandersn @alfaproject @DanielRosenwasser