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 semantic merge conflict in partest tool #10343

Merged
merged 1 commit into from
Mar 14, 2023
Merged

fix semantic merge conflict in partest tool #10343

merged 1 commit into from
Mar 14, 2023

Conversation

SethTisue
Copy link
Member

@SethTisue SethTisue commented Mar 13, 2023 •
edited
Loading

@scala-jenkins scala-jenkins added this to the 2.13.11 milestone Mar 13, 2023
@SethTisue SethTisue added the internal not resulting in user-visible changes (build changes, tests, internal cleanups) label Mar 13, 2023
@SethTisue SethTisue changed the title fix semantic merge conflict in partest fix semantic merge conflict in partest tool Mar 13, 2023
@som-snytt
Copy link
Contributor

Thanks.

#10344

I even gave it a nice title with a pun, and a backstory in the comment section.

som-snytt
som-snytt approved these changes Mar 14, 2023
View reviewed changes
Copy link
Contributor

@som-snytt som-snytt left a comment

Choose a reason for hiding this comment

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

Quick Draw McGraw.

@SethTisue SethTisue mentioned this pull request Mar 14, 2023
Closed
@som-snytt som-snytt merged commit c422784 into scala:2.13.x Mar 14, 2023
@SethTisue SethTisue deleted the fix-semantic-merge-conflict branch March 14, 2023 00:29
@som-snytt
Copy link
Contributor

The Travis spec build failed! I knew we shoulda gone with the other PR.

$ git fetch origin +refs/pull/10343/merge:

fatal: couldn't find remote ref refs/pull/10343/merge

@som-snytt
Copy link
Contributor

And I should have said: Geek Draw McGraw.

@SethTisue
Copy link
Member Author

The Travis spec build failed

because some eager beaver merged the PR before it finished, perhaps?

@som-snytt
Copy link
Contributor

Ah, it was automerged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@som-snytt som-snytt som-snytt approved these changes

Assignees
No one assigned
Labels
internal not resulting in user-visible changes (build changes, tests, internal cleanups)
Projects
None yet
Milestone
2.13.11
3 participants
@SethTisue @som-snytt @scala-jenkins