Version Control
Watch
Introduction to version control
Links to an external site.
Read
- "Version control" on Wikipedia Links to an external site.
- "Distributed version control" on Wikipedia Links to an external site.
Reflect
- For some software projects that you know, can you find out which version control tool is used for development?
- Which files and resources should be placed under version control? (Think of various auxiliary files, such as build files, configuration files, documentation, etc.)
- Can you think of situations where conflicting changes to source files must be resolved manually?
- Can version control also have benefits for non-collaborative software development, i.e., for a single developer? If so, which benefits?
Lecture Part 1
Slides Download Slides and video recording Links to an external site. of part 1.
Lecture Part 2
Part 2 of the lecture (10:50-12:00) has been recorded. You should watch the following two videos on your own.
-
Advanced Git usage
Links to an external site.
(34 min.)
-
Resolving merge conflicts using Git
Links to an external site.
(21 min.)
References
- Scott Chacon and Ben Straub. Pro Git Links to an external site. , CC BY-NC-SA 3.0
- GitHub Help - About pull requests Links to an external site.
- GitHub Guides Links to an external site.