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.

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

Update check file to fix the build #6557

Merged
merged 1 commit into from Apr 25, 2018

Conversation

@lrytz
Copy link
Member

commented Apr 25, 2018

Caused by the change in #6350.
Not sure how the race condition happened exactly, maybe the test case
was merged from 2.12.x somewhere in the meantime.

Update check file to fix the build
Caused by the change in #6350.
Not sure how the race condition happened exactly, maybe the test case
was merged from 2.12.x somewhere in the meantime.

@scala-jenkins scala-jenkins added this to the 2.13.0-M4 milestone Apr 25, 2018

@SethTisue SethTisue merged commit 5a3b670 into scala:2.13.x Apr 25, 2018

1 of 2 checks passed

validate-main [979] Building.
Details
cla @lrytz signed the Scala CLA. Thanks!
Details
@SethTisue

This comment has been minimized.

Copy link
Member

commented Apr 25, 2018

(I've already run Jenkins on this in the context of a different PR)

@dwijnand

This comment has been minimized.

Copy link
Member

commented Apr 25, 2018

#6093 introduced the checkfile, #6350 changed the indentation.

This is classic "semantic conflicts": https://bors.tech/essay/2017/02/02/pitch/

@SethTisue

This comment was marked as resolved.

Copy link
Member

commented Apr 25, 2018

/nothingtoseehere

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.