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.
Upcoming SlideShare
Loading in...5
×

3 workflow

181

Published on

Published in: Technology, Business
0 Comments
1 Like
Statistics
Notes
  • Be the first to comment

No Downloads
Views
Total Views
181
On Slideshare
0
From Embeds
0
Number of Embeds
0
Actions
Shares
0
Downloads
5
Comments
0
Likes
1
Embeds 0
No embeds

No notes for slide

3 workflow

  1. 1. Git, Illuminated workflows | ++
  2. 2. svn start from a straight line
  3. 3. git accept reality even if you work on master, it’s a branch of origin/master
  4. 4. How does your story look? git-svn git-flow github
  5. 5. git-svn the illusion of straight-line development Local work is squashed or rebased onto master
  6. 6. or display reality work that took place in parallel is recorded in parallel
  7. 7. git-svn rebase to bring in work
  8. 8. git-svn rebase to bring in work
  9. 9. git-svn rebase to bring in work
  10. 10. or display reality
  11. 11. or display reality
  12. 12. or display reality
  13. 13. Which branch is for working? git-flow
  14. 14. git-flow master is for releases v2.0 v2.1
  15. 15. git-flow master is for releases v2.0 v2.1
  16. 16. git-flow develop is for progress v2.0 v2.1
  17. 17. git-flow features are for work v2.0 v2.1 feature/ponies
  18. 18. git-flow releases are for testing v2.0 v2.1
  19. 19. git-flow releases are for testing v2.0 v2.1
  20. 20. git-flow releases are for testing v2.0 release/v2.1
  21. 21. git-flow releases are for testing v2.0 release/v2.1
  22. 22. git-flow releases are for testing v2.0 v2.1
  23. 23. git-flow hotfixes are for fixing v2.0 v2.1 v2.0.1
  24. 24. Who decides when it’s ready? github
  25. 25. github author != committer
  26. 26. github author != committer
  27. 27. github author != committer
  28. 28. github author != committer
  29. 29. github fork
  30. 30. github fork
  31. 31. github local fork clone
  32. 32. github local
  33. 33. github local
  34. 34. github local push
  35. 35. github local push
  36. 36. github local push
  37. 37. github local push
  38. 38. github local push pull request
  39. 39. github local
  40. 40. choose the shape of your history choose your level of reality choose tightness of control Your story is what you make it.
  1. A particular slide catching your eye?

    Clipping is a handy way to collect important slides you want to go back to later.

×