Lecture notes
Version control and Git
Functions of version control
- Saves versions
- Assigns unique names to each version
- Maintains the relations between the various versions
- Keeps track of the current version pointer
Most common actions in version control
- Commit / Checkin → Current version gets updated with the changes
- Dropping a version / Reverting back → move the current version back to a previous commit
- Master/Main branch → “Official” version
- Repository → Structured library of a version control mechanism (local or online)
- Checking out → Retrieving a read-only copy of the code
- Merge →
- Conflict → Issues in merging commits. Often have to be handled manually
- Staging environment → included changes to be committed
How version control works
- Individual file versions are independent, but the current version pointer keeps the current version of each file in sync.