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

Fix inconsistent merge #30

Merged
merged 3 commits into from
Jul 28, 2021
Merged

Fix inconsistent merge #30

merged 3 commits into from
Jul 28, 2021

Conversation

thomasw21
Copy link
Member

@thomasw21 thomasw21 commented Jul 28, 2021 •
edited
Loading

Merges didn't take in account document ids (whatever they were used for). This PR fixes this. Maybe we should fix this upstream?

Small colab to check that merge or without merge should be the same
https://colab.research.google.com/drive/1haC-r0t0TnhYlx0y3j3yqXsYdNAjUv2A#scrollTo=7jAoQyI9A5D-

Thanks @ontocord for spotting the issue!

@thomasw21 thomasw21 requested a review from stas00 July 28, 2021 07:53
stas00
stas00 approved these changes Jul 28, 2021
View reviewed changes
Copy link
Member

@stas00 stas00 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Thank you for fixing!

We have a special Issue that keeps track of changes which we can then offer upstream: #10

Mind adding it there?

@thomasw21 thomasw21 merged commit 0125aaa into bigscience-workshop:main Jul 28, 2021
@thomasw21 thomasw21 mentioned this pull request Jul 28, 2021
Open
@thomasw21 thomasw21 deleted the fix_inconsistent_merge branch August 17, 2021 13:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stas00 stas00 stas00 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
@thomasw21 @stas00