Version control systems Flashcards
Version
Snapshot
Branch
(temporarily) independent development line
Merge
Integration of a branch into another development line
Merge conflict
A problem that occurs when attempting a merge with changes that cannot be integrated easily
Development line
A logically sequential line of version
Tag
Named version in the repository
SVN stands for
Subversion
What does it mean that SVN is a client sever version control system?
SVN operates on a client-server model, which means that there are two main components: the client and the server.
Developers have a local working copy on their machine (but not a full repo with complete history).
The server is a centralised repo that stores the complete version history of the project.
Definition SVN
Subversion is a centralised version control system used for tracking changes in files and directories.
SVN repository
SVN uses a centralised repository to store the complete version history of a project.
SVN branching and merging
Supports branching and merging, but can be more manual and less intuitive compared to git
True or false:
SVN allows to check out parts of the repository (directories/files)
True
SVN import
Initialise repository from working copy.
svn import C:\repository https://www.example.com/svn
From computer to repository.
Put a directory under version control by sending its data from the local computer to the remote repository. This is done only once for a directory to initialise the repository with the respective data.
SVN Checkout
Initialize working copy from repository.
svn checkout https://www.example.com/svn C:\repository
Initialise a local working copy with the data from the repository. This is only done once for a directory from the repository when copying to the local computer.
SVN commit
Send changes from working copy to repository.
svn commit -m “Completed printing feature.”
Send changes to the repository, which then makes an effort to integrate it into the current state of the repository (even if this may have changed since the last update).
SVN update
Retrieve changes from repository to working copy.
svn update
Retrieve changed data from the repository where it is integrated into the current state of the working copy.
SVN add
The add command tells SVN to have the specified files under version control, i.e., when committing to the repository, it check if there were changes and, if so, stores them as new version.
Put new file(s) under version control.
svn add Example1.java
Git definition
Git is a distributed version control system that allows multiple developers to work on a project individually.
Git repository
Each developer has a complete copy of the repository, including the full version history, making it a distributed system.
Git branching and merging
Branching and merging are fundamental and easy to use.
Git Workflow
Follows a distributed model, enabling developers to work offline and commit changes locally before pushing to a central repository.