The new X-Men movie explained in Git
hashrocket.com
hashrocket.com
To me, the beauty of the story is that, while we as viewers do not know what has transpired in the universe between 1973 and present, neither does Wolverine. Further, since he stills ends up at the School with his friends alive in the present day, we know that a lot of character development has necessarily happened, because we saw analogous stories in the earlier movies from the now lost timeline. So while the events of the previous movies are now no longer canonical history, they are as real to Logan as they were to us, and their emotional impact still affected Logan's life in a very real way. Meanwhile, going forward the script writers are no longer slaves to continuity, which, after the third film blew up everything, greatly restricted what they could do with the main cast of characters in the present day setting.
In my opinion, so many "time reset" plots (think Star Trek Voyager's Year of Hell) leave the viewer empty because they truly have no lasting consequence on the character's we love. SF Debris (http://blip.tv/sf-debris-opinionated-reviews/voy-year-of-hel...) made the incredible suggestion that, in that Star Trek story, imagine what if, due to some kind of quantum chronometric mumbo jumbo, one of the crew members (say, Harry Kim!) had survived the big reset with their memories and experiences of the year intact. But instead, apart from some shallow insights into the characters in a "what if" scenario, it was as though it never happened.
You see that in the film, where he meets some characters he previously knew but didn't expect to see. But we don't see the other side of this: there are surely characters in the new timeline that Wolverine is very close to that he will have no memory of. I guess that sucks for those characters.
Wolverine's return to the new future essentially kills off the one that had been living in that timeline since 1973 and nobody cares.
The Professor was in Wolverine's head back in the day and might have learned a few things that needed to to be done.
apocalypse@eygpt$ git init
touch README.md; git add README.md
git commit -m 'Build Pyramids' git remote add horseman1 git@github.horseman1/apocalypse.git
git remote add horseman2 git@github.horseman2/apocalypse.git
git remote add horseman3 git@github.horseman3/apocalypse.git
git remote add horseman4 git@github.horseman4/apocalypse.githttp://mercurial.selenic.com/wiki/BisectExtension
As for git stash, the closest equivalent appear[1] to be the shelve extension (distributed with mercurial since 2.8, November 2013):
http://mercurial.selenic.com/wiki/ShelveExtension
However, as we'll be needing to do a bit of history editing, we might want to just go straight for the (also bundled with mercurial) queues extension:
http://mercurial.selenic.com/wiki/MqExtension
Also relevant:
http://mercurial.selenic.com/wiki/EditingHistory http://mercurial.selenic.com/wiki/MqTutorial
I'm a little tempted to redo this for mercurial, just to look at the differences -- but the first order would be to create an actual repo -- say just a file with timestamps and events:
-479: Artaÿctes crucified
(...)
1973: Wolverine wakes up in random bed
1973: Mystique kills Trask
1973: Mystique's DNA stolen
xx: Last mutant killed by sentinel
That way we could use it as a nice way to compare work flows across scms... Who's up for doing RCS?
Come to think of it, as the initial series of commits are linear, they could be specified in some linear fashion (yml maybe) -- and then replayed to create the initial "broken" state -- then one would only have to document the "fixing" part for different systems... Another alternative would be to convert (eg via mercurials git/svn plugins -- but I don't think they cover bzr, monotone and rcs...).
[1] http://selenic.com/pipermail/mercurial/2011-December/041164....
However, wolverine's consciousness was "sent back" into his alternate timeline body. At least, that's the idea.
He didn't. He just has all his memories from the original timeline (e.g. previous X-Men and Wolverine films), plus the events he experienced during Days of Future Past. He has no memory of what happened to him between 1973 and the present in the new timeline (which he created). That's why he's surprised to see a few characters at the end of DoFP. He remembers them from the original timeline, but he also remembers them dying in the original timeline. What would be much stranger is if they had never met him in the new timelines (in which case he would remember them but they wouldn't know him), or if he had met someone in the new timeline but not the original timeline (in which case they would know him but he would have no memory of them).