Part 4 of Git, Illuminated

480 views

Published on

StrangeLoop 2013

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

  • Be the first to like this

No Downloads
Views
Total views
480
On SlideShare
0
From Embeds
0
Number of Embeds
4
Actions
Shares
0
Downloads
5
Comments
0
Likes
0
Embeds 0
No embeds

No notes for slide

Part 4 of Git, Illuminated

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

×