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

update checkfiles (fix semantic merge conflict) #10478

Merged
merged 1 commit into from
Jul 23, 2023
Merged

update checkfiles (fix semantic merge conflict) #10478

merged 1 commit into from
Jul 23, 2023

Conversation

SethTisue
Copy link
Member

@SethTisue SethTisue commented Jul 23, 2023 •
edited
Loading

conflict between #10462 and #10473, I think

@SethTisue SethTisue added the internal not resulting in user-visible changes (build changes, tests, internal cleanups) label Jul 23, 2023
@SethTisue SethTisue self-assigned this Jul 23, 2023
@scala-jenkins scala-jenkins added this to the 2.13.13 milestone Jul 23, 2023
@SethTisue SethTisue modified the milestones: 2.13.13, 2.13.12 Jul 23, 2023
@SethTisue SethTisue merged commit 344d99b into scala:2.13.x Jul 23, 2023
1 check passed
@SethTisue SethTisue deleted the fix-migration-semantic-merge-conflict branch July 23, 2023 04:42
@som-snytt
Copy link
Contributor

Pretty gnarly site site=test1.Test.f.$anon.<local $anon>.

@som-snytt
Copy link
Contributor

Also thanks, just ran partest and experienced momentary panic until I remembered to update locally.

@lrytz lrytz mentioned this pull request Aug 2, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@SethTisue SethTisue

Labels
internal not resulting in user-visible changes (build changes, tests, internal cleanups)
Projects
None yet
Milestone
2.13.12
Development

Successfully merging this pull request may close these issues.
3 participants
@SethTisue @som-snytt @scala-jenkins