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 shared specs for Process.fork/Kernel.fork/Kernel#fork #1214

Merged
merged 1 commit into from
Nov 9, 2024

Conversation

herwinw
Copy link
Member

@herwinw herwinw commented Nov 7, 2024

A number of tests called Process.fork, so the specs for Kernel were mostly calling the wrong method.

A number of tests called `Process.fork`, so the specs for Kernel were
mostly calling the wrong method.
@andrykonchin
Copy link
Member

The GitHub merge option "Create a merge commit" is disabled. What is a proper way to merge PR now?
cc @eregon

@eregon
Copy link
Member

eregon commented Nov 9, 2024

Rebase and merge is better

@eregon
Copy link
Member

eregon commented Nov 9, 2024

In general I'm trying to keep the ruby/spec history linear as it makes it much simpler e.g. to understand what changes happened to a file, in which order, without having to consider conflicts.
When we sync we rebase anyway.

@eregon eregon merged commit 4770b42 into ruby:master Nov 9, 2024
14 checks passed
@herwinw herwinw deleted the shared_process_fork branch November 9, 2024 13:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants