0
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Subversion Open Source Version Control
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Version control?
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Version control? fr eed om
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org In the old days... Wait! Why am I using a Mac?
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org This new code is awesome! This new code is awesome! ...
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Hey!  You saved over my awesome code! Hey!  You save...
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Conflict Resolution In the old days...
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Subversion This new code is awesome! Commit
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Hey!  That is some awesome code! Update Subversion
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org This new code is awesome! This new code is awesome! ...
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org I'll merge your changes into a big ball of awesomene...
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org We rock! Let's go get milkshakes! We rock! Let's go ...
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org You both changed the same code!  I can't merge this!...
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Conflict Resolution? Subversion
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org NO! Conflict Resolution? Subversion
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Conflict Resolution. Subversion
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org 1. Merge the changes yourself (using a tool like Win...
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Some Idiot Commits a Change Commit
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Some Idiot Commits a Change
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Some Idiot Commits a Change Checkout the previous re...
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org ...and it's like it never happened. You can go back ...
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org I fixed Vista! Subversion
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org No, wait. Undo that. Revert Subversion
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Computer broken? Get a new computer. Then, get a fre...
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Computer broken? You'll only lose what you haven't c...
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Not just for developers. Some sysadmins use version ...
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Subversion Clients And many more. Seriously, they're...
Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org For More Information: Version Control With Subversio...
Upcoming SlideShare
Loading in...5
×

Subversion

3,175

Published on

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

No Downloads
Views
Total Views
3,175
On Slideshare
0
From Embeds
0
Number of Embeds
0
Actions
Shares
0
Downloads
67
Comments
0
Likes
6
Embeds 0
No embeds

No notes for slide

Transcript of "Subversion"

  1. 1. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org
  2. 2. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Subversion Open Source Version Control
  3. 3. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Version control?
  4. 4. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Version control? fr eed om
  5. 5. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org
  6. 6. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org In the old days... Wait! Why am I using a Mac?
  7. 7. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org This new code is awesome! This new code is awesome! In the old days...
  8. 8. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Hey! You saved over my awesome code! Hey! You saved over my awesome code! In the old days...
  9. 9. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Conflict Resolution In the old days...
  10. 10. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Subversion This new code is awesome! Commit
  11. 11. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Hey! That is some awesome code! Update Subversion
  12. 12. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org This new code is awesome! This new code is awesome! Commit Commit Subversion
  13. 13. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org I'll merge your changes into a big ball of awesomeness! Subversion
  14. 14. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org We rock! Let's go get milkshakes! We rock! Let's go get milkshakes! Subversion
  15. 15. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org You both changed the same code! I can't merge this! Subversion
  16. 16. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Conflict Resolution? Subversion
  17. 17. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org NO! Conflict Resolution? Subversion
  18. 18. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Conflict Resolution. Subversion
  19. 19. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org 1. Merge the changes yourself (using a tool like WinMerge or a text editor)‏ 2. Tell Subversion the changes are resolved 3. Commit the resolved version 4. Go get milkshakes Conflict Resolution. Subversion
  20. 20. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Some Idiot Commits a Change Commit
  21. 21. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Some Idiot Commits a Change
  22. 22. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Some Idiot Commits a Change Checkout the previous revision. Then, commit.
  23. 23. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org ...and it's like it never happened. You can go back to any old version at any time.
  24. 24. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org I fixed Vista! Subversion
  25. 25. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org No, wait. Undo that. Revert Subversion
  26. 26. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Computer broken? Get a new computer. Then, get a fresh copy of your code from Subversion.
  27. 27. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Computer broken? You'll only lose what you haven't committed yet.
  28. 28. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Not just for developers. Some sysadmins use version control to track changes to config files. They like the “revert” command for when they really mess up.
  29. 29. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org Subversion Clients And many more. Seriously, they're like rabbits.
  30. 30. Dave Ross The West Suburban Chicago PHP Meetup suburbanchicagophp.org For More Information: Version Control With Subversion http://svnbook.red-bean.com/ (or buy the book – authors gotta eat, too)‏ subversion.tigris.org Wikipedia
  1. A particular slide catching your eye?

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

×