The new X-Men movie explained in Git • Hacker News Board

Re: The new X-Men movie explained in Git

#11

Post by Roboprog » Thu, Jun 05, 2014, 2:23 PM UTC

mnw21cam wrote: post #8

rog3r wrote: post #7

wibbly wobbly timey commit.

Do you mean timey wimey?

Where did Torvalds get that screwdriver?!?

Re: The new X-Men movie explained in Git

#12

Post by smallegan » Thu, Jun 05, 2014, 2:28 PM UTC

This had the exact opposite effect on me of further explaining some Git features via the X-Men movie!

Re: The new X-Men movie explained in Git

#13

Post by peterkelly » Thu, Jun 05, 2014, 2:29 PM UTC

Except you've thrown away everything that's happened since 1973, some of which you may still want. There's going to be a lot of awful lot of manual conflict resolution to handle - or is there a "world" script that can be run off the new HEAD that plays out the series of events that result from the sentinels being prevented?

Re: The new X-Men movie explained in Git

#14

Post by nailer » Thu, Jun 05, 2014, 2:30 PM UTC

Also:

    apocalypse@eygpt$ git init

    touch README.md; git add README.md

    git commit -m 'Build Pyramids'

Re: The new X-Men movie explained in Git

#15

Post by RVijay007 » Thu, Jun 05, 2014, 2:30 PM UTC

You forgot the post-credit scene showing Apocalypse 5000 years ago in Egypt with his 4 horsemen! :-)

Re: The new X-Men movie explained in Git

#16

Post by nailer » Thu, Jun 05, 2014, 2:31 PM UTC

Also: the movie starts with a branch where nearly everyone dies, and Kitty Pride/Bishop reverts a few commits.

Re: The new X-Men movie explained in Git

#17

Post by SergeyDruid » Thu, Jun 05, 2014, 2:32 PM UTC

So what about "Lost"?

Re: The new X-Men movie explained in Git

#18

Post by technoweenie » Thu, Jun 05, 2014, 2:37 PM UTC

SergeyDruid wrote: post #17

So what about "Lost"?

Whatever happened, happened. There's no rebasing involved. There's just a lot of jumping around to various tags at different points in time.

Re: The new X-Men movie explained in Git

#19

Post by lrgalego » Thu, Jun 05, 2014, 3:00 PM UTC

SergeyDruid wrote: post #17

So what about "Lost"?

Thats the problem with Lost. They don't know how to use git.

Re: The new X-Men movie explained in Git

#20

Post by hpvic03 » Thu, Jun 05, 2014, 3:02 PM UTC

peterkelly wrote: post #13

Except you've thrown away everything that's happened since 1973, some of which you may still want. There's going to be a lot of awful lot of manual conflict resolution to handle - or is there a "world" script that can be run off the new HEAD that plays out the series of events that result from the sentinels being prevented?

I suppose that's true. Maybe the desired commits could be cherry picked onto the branch before you make the branch into master.