• Share
  • Email
  • Embed
  • Like
  • Save
  • Private Content
3 workflow
 

3 workflow

on

  • 197 views

 

Statistics

Views

Total Views
197
Views on SlideShare
197
Embed Views
0

Actions

Likes
1
Downloads
2
Comments
0

0 Embeds 0

No embeds

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

    3 workflow 3 workflow Presentation Transcript

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