fordy on 11 December 2012
You missed the other big theory, which is the "Split timeline" theory. Another timeline is created upon point of changing the original, allowing both possibilities to exist. (notable examples are Dragonball Z and Ocarina of Time)