Part 4 of Git, Illuminated
Upcoming SlideShare
Loading in...5
×
 

Part 4 of Git, Illuminated

on

  • 337 views

StrangeLoop 2013

StrangeLoop 2013

Statistics

Views

Total Views
337
Views on SlideShare
334
Embed Views
3

Actions

Likes
0
Downloads
2
Comments
0

1 Embed 3

https://twitter.com 3

Accessibility

Categories

Upload Details

Uploaded via as Adobe PDF

Usage Rights

© All Rights Reserved

Report content

Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
  • Full Name Full Name Comment goes here.
    Are you sure you want to
    Your message goes here
    Processing…
Post Comment
Edit your comment

Part 4 of Git, Illuminated Part 4 of Git, Illuminated Presentation Transcript

  • Wednesday, September 18, 13
  • Wednesday, September 18, 13
  • @jessitron http://gitworkshop.jessitron.com Wednesday, September 18, 13
  • Wednesday, September 18, 13
  • Git, Illuminated workflows | ++ Wednesday, September 18, 13
  • svn start from a straight line Wednesday, September 18, 13
  • git accept reality even if you work on master, it’s a branch of origin/master Wednesday, September 18, 13
  • How does your story look? git-svn git-flow github Wednesday, September 18, 13
  • git-svn the illusion of straight-line development Local work is squashed or rebased onto master Wednesday, September 18, 13
  • or display reality work that took place in parallel is recorded in parallel Wednesday, September 18, 13
  • git-svn rebase to bring in work Wednesday, September 18, 13
  • git-svn rebase to bring in work Wednesday, September 18, 13
  • git-svn rebase to bring in work Wednesday, September 18, 13
  • or display reality Wednesday, September 18, 13
  • or display reality Wednesday, September 18, 13
  • or display reality Wednesday, September 18, 13
  • Which branch is for working? git-flow Wednesday, September 18, 13
  • git-flow master is for releases v2.0 v2.1 Wednesday, September 18, 13
  • git-flow master is for releases v2.0 v2.1 Wednesday, September 18, 13
  • git-flow develop is for progress v2.0 v2.1 Wednesday, September 18, 13
  • git-flow features are for work v2.0 v2.1 feature/ponies Wednesday, September 18, 13
  • git-flow releases are for testing v2.0 v2.1 Wednesday, September 18, 13
  • git-flow releases are for testing v2.0 v2.1 Wednesday, September 18, 13
  • git-flow releases are for testing v2.0 release/v2.1 Wednesday, September 18, 13
  • git-flow releases are for testing v2.0 release/v2.1 Wednesday, September 18, 13
  • git-flow releases are for testing v2.0 v2.1 Wednesday, September 18, 13
  • git-flow hotfixes are for fixing v2.0 v2.1 v2.0.1 Wednesday, September 18, 13
  • Who decides when it’s ready? github Wednesday, September 18, 13
  • github author != committer Wednesday, September 18, 13
  • github author != committer Wednesday, September 18, 13
  • github author != committer Wednesday, September 18, 13
  • github author != committer Wednesday, September 18, 13
  • github fork Wednesday, September 18, 13
  • github fork Wednesday, September 18, 13
  • github local fork clone Wednesday, September 18, 13
  • github local Wednesday, September 18, 13
  • github local Wednesday, September 18, 13
  • github local push Wednesday, September 18, 13
  • github local push Wednesday, September 18, 13
  • github local push Wednesday, September 18, 13
  • github local push Wednesday, September 18, 13
  • github local push pull request Wednesday, September 18, 13
  • github local Wednesday, September 18, 13
  • choose the shape of your history choose your level of reality choose tightness of control Your story is what you make it. Wednesday, September 18, 13
  • Wednesday, September 18, 13