Skip to content

Pull request #1

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

Open
david-mears-2 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Pull request #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,4 @@
This repository is an alternate universe that evolves around the trolley problem. The reality of the universe is whatever the master branch says.

# What is happening?
At this point in time, there is a runaway trolley barreling down the railway tracks. Ahead, on the tracks, there are five people tied up and unable to move. The trolley is headed straight for them. On a side track, there is one person tied to the tracks. Coincedentally, there is also a fat man on a bridge above the track. If you do nothing, the other contributer, physics, will soon update master such that the trolley kills the five people.
You `checkout` all branches reality can take it this point, and find that among others there is a `lever`, a `fatman`. Which is the more ethical option?:
- `git pull lever`
- `git push origin fatman:master`
The lever has been pulled, diverting the trolley onto the side track where it killed one person. The fat man and the other five people are saved.