Version Control Systems

Weekly outline

• General
  

  General

  ---

  Version Control Systems

  Lectures and Exercises: Juraj Oravec
  

  ---

  • General Information

  • News forum
  • About the course Page
  • Syllabus Page
  • References and study materials Page
  • Version Control Systems - google document URL
  • Mercurial - Command Line File
  • Git - Command Line File
  • TortoiseHG and Bitbucket - guide File
• 19 September - 25 September
  

  19 September - 25 September

  • Collaborative Development

  • Scope Page
  • Lecture

  • Lecture - Collaborative Development File
  • Lecture - Public Repository Hosting and GUI File
  • Lecture - Providing Support File
  • References

  • References Page
  • Illustrated introduction to distributed version control URL
  • Distributed version control page on Wikipedia URL
  • Source control integration in MATLAB URL
• 26 September - 2 October
  

  26 September - 2 October

  
  

  • Mercurial vs Git

  • Scope Page
  • Lecture

  • Lecture - Mercurial vs Git File
  • Mergurial - Workflow File
  • Git - Workflow File
  • Exercise

  • Bitbucket homepage URL
  • Github homepage URL
  • Download Git URL
  • Choose GUI URL
  • TortoiseHg URL
  • TortoiseGit URL
  • References

  • Mercurial vs. Git: why Mercurial? URL
  • Mercurial vs. Git: why Git? URL
  • TortoiseHG tutorial on YouTube URL
  • TortoiseHG and Bitbucket - guide File
• 3 October - 9 October
  

  3 October - 9 October

  • Mercurial – File Management

  • Scope Page
  • Lecture

  • Mercurial - File Management
  • References

  • References Page
  • Mercurial homepage URL
  • Mercurial wiki URL
  • Mercurial: The Definitive Guide URL
• 10 October - 16 October
  

  10 October - 16 October

  
  

  • Mercurial – Commit Management

  • Scope Page
  • Lecture

  • Mercurial - Commit Management File
  • Exercise

  • Exercise - Committing Exercise - Europe File
  • Exercise - Committing Exercise - Pizza - 2 Users File
  • Exercise - Committing Exercise - Pizza - 3 Users File
  • Exercise - Committing Exercise - House File
  • References

  • SHA1 and Mercurial security URL
• 17 October - 23 October
  

  17 October - 23 October

  
  

  • Mercurial – Branches and Merging
    

  • Scope Page
  • Lecture

  • Mercurial - Branches and Merging File
  • Exercise

  • Exercise - Mercurial - Branches and Merging - Windows File
  • References

  • Mercurial Commands Help URL
  • Book - Chapter 5 URL
• 24 October - 30 October
  

  24 October - 30 October

  
  

  • Mercurial – Resolving Conflicts

  • Scope Page
  • Lecture

  • Mercurial - Resolving Conflicts File
  • Exercise

  • Exercise - Mercurial - Resolving Conflicts Exercise - 2D Plots – 2 Users File
  • Exercise - Mercurial - Resolving Conflicts Exercise - 3D Plots – 2 Users File
  • Exercise - Mercurial - Resolving Conflicts Exercise - 2D Plots – 3 Users File
  • Exercise - Mercurial - Resolving Conflicts Exercise - 3D Plots – 3 Users File
  • References

  • Merge page on Wikipedia URL
• 31 October - 6 November
  

  31 October - 6 November

  
  

  • Mercurial – Project

  • Scope Page
  • Project

  • Mercurial - Project Assignment
• 7 November - 13 November
  

  7 November - 13 November

  
  

  • Git – File Management

  • Scope Page
  • Lecture

  • Git - File Management
  • Git - How to configure mergetool kdiff3 File
  • Exercise

  • References

  • GIT homepage URL
  • Git Book - 2nd version URL
• 14 November - 20 November
  

  14 November - 20 November

  • Git – Commit Management

  • Scope Page
  • Lecture

  • Git - Commit Management File
  • Exercise

  • Exercise - Git - Committing Exercise - Europe File
  • Exercise - Git - Committing Exercise - Pizza - 2 Users File
  • Exercise - Git - Committing Exercise - Pizza - 3 Users File
  • Exercise - Git - Committing Exercise - House File
  • References

  • Learn Git with Bitbucket Cloud URL
• 21 November - 27 November
  

  21 November - 27 November

  • Git – Branches and Merging
    

  • Scope Page
  • Lecture

  • Git - Branches and Merging File
  • Exercise

  • Exercise - Git - Branching Exercise - Windows File
  • References

  • Branching a Repository URL
  • Making a Pull Request URL
  • Pull Requests and Code Review URL
  • Create a Pull Request to Merge Your Change URL
• 28 November - 4 December
  

  28 November - 4 December

  
  

  • Git – Resolving Conflicts

  • Scope Page
  • Lecture

  • Git - Resolving Conflicts File
  • Exercise

  • Exercise - Git - Resolving Conflicts Exercise - 2D Plots – 2 Users File
  • Exercise - Git - Resolving Conflicts Exercise - 2D Plots – 3 Users File
  • Exercise - Git - Resolving Conflicts Exercise - 3D Plots – 2 Users File
  • Exercise - Git - Resolving Conflicts Exercise - 3D Plots – 3 Users File
  • References

  • Resolve Merge Conflicts URL
• 5 December - 11 December
  

  5 December - 11 December

   

  • Git – Project

  • Scope Page
  • Project

  • Git - Project Assignment
• 12 December - 18 December
  

  12 December - 18 December

  • Version Control Systems - Final Project Assignment