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

Correct failed fix from #2068 #2070

Merged
merged 1 commit into from Aug 15, 2019

Conversation

olivierlacan
Copy link
Contributor

@mame Looks like my force-push to update the branch before you merged it failed. So this one should address the issues you brought up in #2068.

Apologies for the mistake.

@olivierlacan olivierlacan changed the title Correct bad merge from #2068 Correct missed merge from #2068 Jan 15, 2019
@olivierlacan olivierlacan changed the title Correct missed merge from #2068 Correct failed fix from #2068 Jan 15, 2019
@olivierlacan
Copy link
Contributor Author

Not sure why the changes from 10d85b1 are not showing up in trunk within the GitHub diff interface.

My previous attempt to correct ruby#2068 apparently failed and the confusing
wording ("instances") was merged into trunk instead.

This should address any potential confusion.
@olivierlacan
Copy link
Contributor Author

@mame Ok I've fixed the issue with the diff, my branch was visibly missing the trunk commit. Sorry about that.

@olivierlacan
Copy link
Contributor Author

@mame Could you take a look at this?

@k0kubun k0kubun changed the base branch from trunk to master August 15, 2019 15:41
@k0kubun
Copy link
Member

k0kubun commented Aug 15, 2019

This looks good to me, thanks!

@k0kubun k0kubun merged commit 7c46aa6 into ruby:master Aug 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants