Skip to content
Open
Changes from all commits
Commits
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
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`
A new fork was created. There are no people tied on this fork of the track. If you `pull` the fork, noone will die, but the original set-up of the thought experiment will be overwritten and the joke will be lost to `git` history.