@vyr

“upstream" is now "canon"
"merge" is now "canonize” (@akjcv beat me to it lol)
"fork" and "branch” are now "headcanon”
"rebase" is now "retcon”
"BDFLs exercising control to do dumb shit" are now "George Lucas releasing another special edition”