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.

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

Incorrect merge #341

Open
doug65536 opened this issue Jan 25, 2022 · 3 comments
Open

Incorrect merge #341

doug65536 opened this issue Jan 25, 2022 · 3 comments
Labels
bug merge planned-for-next-release

Comments

@doug65536
Copy link

doug65536 commented Jan 25, 2022 •
edited

JSFiddle repro

What happened to def lambda... in "mine"? It ate it, right?

EDIT: link updated to fix "mine" terminology
@doug65536 doug65536 mentioned this issue Jan 26, 2022
Open
@doug65536
Copy link
Author

doug65536 commented Jan 26, 2022 •
edited

I don't know if it is better or not, reduced the repro. Note that "t3" is lost in "mine".

@doug65536
Copy link
Author

Is it because I am missing a "fuzz" algorithm when interpreting/applying the merge output, or is that t3 line intended to be in the merge result?

@ExplodingCabbage
Copy link
Collaborator

Interesting. Yeah, this is a bug.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
bug merge planned-for-next-release
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@ExplodingCabbage @doug65536