Ship it Squirrel

[Geoff Hogg]

I have stumbled upon a rather good advanced level github guide:

http://zachholman.com/talk/more-git-and-github-secrets/

I really need to get good at github. I've taken a branch of a project, but how do I update my branch to be upto date with the master?

Part way through (slide 101) it has a rather splendid bit on using emoji scripts to the text, and the "Shipit Squirrel", a meme I have hitherto been unaware of

http://www.geoffreywiseman.ca/blog/2013/03/15/shipit-update-plan/

All these ephemera are great fun, but they date it, and in a few years time people will be non-plussed by it all. Such is the path wended by culture.

shipit real good

Geoff

Geoff Hogg

[Ioannis Mavroukakis]

If I remember correctly merge master into branch, resolve conflicts and commit. Look for The Interactive Git Demo , it will show you one of two ways to do this. 

--
You received this message because you are subscribed to the Google Groups "London - Coursera/Udacity/Edx etc. online course Study Group" group.
To unsubscribe from this group and stop receiving emails from it, send an email to london-stanford-study-gr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
 
 

[Ioannis Mavroukakis]

http://pcottle.github.io/learnGitBranching/?demo

On 25 Jul 2013, at 13:33, Geoff Hogg <geoff...@gmail.com> wrote:

--

[Geoff Hogg]

I know the overview of how to do it.

Merge master into branch, then merge branch back into master.

However I've not been able to do it right.


The link you posted looks to be a huge help, a great find.


There are billions, and billions of open source projects, so I have plenty of opportunity to learn through trying, just so long as I don't infuriate people.

Geoff

Geoff Hogg

[Greg Gauthier]

It's only December, and I'm already nonplussed.