Stop using git like   subversion      Ben Scheirman
what scm tool are   you using?
what scm tool are    you using?Subversion?     TFS?           VSS?         CVS?      Perforce?MKS?       FSA?        git? ...
stop me if this sounds      familiar
ServerFred            Amy
ServerFred            Amy
ServerFred            Amy
ServerFred            Amy
ServerFred            Amy
ServerFred            Amy
ServerFred            Amy
Drawbacks of Subversion
Enter the distributed       model...
Distributed
Git Demo* initialization* staging files* committing   * remotes * push / pull
Branching
Branching   Dont believe theFUD....branching is EASY
Branching islightweight
Branching islightweight
Branching islightweight
Branching islightweight
Branching islightweight
Merge vs Rebase
Merge vs Rebase           Merge
Merge vs Rebase           Merge           Rebase
Never rebase a public       branch
Git Demo * branch * merge *rebase
Feature Branchesa.k.a "topic" branches
Merge (no fast-
Hotfixes
Contributing to open source    Fork & Clone the project  $ git clone git@github.com/username/project.gitAdd a remote calle...
Thank Youhttp://nvie.com/posts/a-successful-git-branching-model/
Stop using git like subversion
Stop using git like subversion
Upcoming SlideShare
Loading in …5
×

Stop using git like subversion

878 views
769 views

Published on

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

No Downloads
Views
Total views
878
On SlideShare
0
From Embeds
0
Number of Embeds
0
Actions
Shares
0
Downloads
7
Comments
0
Likes
2
Embeds 0
No embeds

No notes for slide
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • \n
  • Stop using git like subversion

    1. 1. Stop using git like subversion Ben Scheirman
    2. 2. what scm tool are you using?
    3. 3. what scm tool are you using?Subversion? TFS? VSS? CVS? Perforce?MKS? FSA? git? hg?
    4. 4. stop me if this sounds familiar
    5. 5. ServerFred Amy
    6. 6. ServerFred Amy
    7. 7. ServerFred Amy
    8. 8. ServerFred Amy
    9. 9. ServerFred Amy
    10. 10. ServerFred Amy
    11. 11. ServerFred Amy
    12. 12. Drawbacks of Subversion
    13. 13. Enter the distributed model...
    14. 14. Distributed
    15. 15. Git Demo* initialization* staging files* committing * remotes * push / pull
    16. 16. Branching
    17. 17. Branching Dont believe theFUD....branching is EASY
    18. 18. Branching islightweight
    19. 19. Branching islightweight
    20. 20. Branching islightweight
    21. 21. Branching islightweight
    22. 22. Branching islightweight
    23. 23. Merge vs Rebase
    24. 24. Merge vs Rebase Merge
    25. 25. Merge vs Rebase Merge Rebase
    26. 26. Never rebase a public branch
    27. 27. Git Demo * branch * merge *rebase
    28. 28. Feature Branchesa.k.a "topic" branches
    29. 29. Merge (no fast-
    30. 30. Hotfixes
    31. 31. Contributing to open source Fork & Clone the project $ git clone git@github.com/username/project.gitAdd a remote called "ypstream" $ git remote add upstream http://github.com/user/ project.git
    32. 32. Thank Youhttp://nvie.com/posts/a-successful-git-branching-model/

    ×