Source Code Management tools

557 views
482 views

Published on

Published in: Technology
1 Comment
0 Likes
Statistics
Notes
  • Be the first to like this

No Downloads
Views
Total views
557
On SlideShare
0
From Embeds
0
Number of Embeds
3
Actions
Shares
0
Downloads
9
Comments
1
Likes
0
Embeds 0
No embeds

No notes for slide

Source Code Management tools

  1. 1. Source Code Management Tools Cl´ment Delafargue e ´ Ecole Centrale de Nantes – EklaWeb March 4, 2010
  2. 2. Your workflows The MELOG TA - How did you manage to share your work ? Mail ? USB stick ?
  3. 3. Your workflows How would have you done with a single file edited by everybody at the same time ? if you’d wanted to discard some changes ?
  4. 4. What a SCM system is A history of your files A way to share files within a team
  5. 5. What a SCM system is NOT A replacement to communication
  6. 6. Source Code Management Tools Basic notions Centralized / Decentralized How can SCM help you ?
  7. 7. Basic notions Repository Contains the history Not directly usable
  8. 8. Basic notions Working copy Files you can work on An image of the repository at a certain time
  9. 9. Basic notions Commit The act of sending your local modifications to a repository Sould be atomic
  10. 10. Basic notions Branch A Parallel version
  11. 11. Basic notions Trunk The main branch
  12. 12. Basic notions Conflict resolution When magic is not enough
  13. 13. Source Code Management Tools Basic notions Centralized / Decentralized How can SCM help you ?
  14. 14. Centralized SCM Centralized SCM is Centralized Only ONE (remote) repository
  15. 15. Introducing Subversion
  16. 16. Decentralized SCM Everybody has his own repo Every one has his own branch Eventual consistency Network of trust
  17. 17. When centralized is not enough Who wants to break the trunk ? Committing without sharing... yet
  18. 18. When centralized is not enough Local repository is local Do almost anything... even if you’re offline
  19. 19. When centralized is not enough Branching and merging is cheap If a task is to last for one day or more... make it a branch
  20. 20. Introducing Git
  21. 21. Source Code Management Tools Basic notions Centralized / Decentralized How can SCM help you ?
  22. 22. How can SCM help you ? Your workflows... evolved
  23. 23. Copyright notice – CC-By-SA 2.0 You are free to Share: to copy, distribute and transmit the work to Remix: to adapt the work Under the following conditions Attribution: You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work). Share Alike: If you alter, transform, or build upon this work, you may distribute the resulting work only under the same or similar license to this one.

×