A "Version control" system (also known as a Revision Control System) is a repository of files,
often the files for the source code of computer programs, with monitored access. Every change
made to the source is tracked, along with who made the change, why they made it, and references
to problems fixed, or enhancements introduced, by the change.

Version control systems are essential for any form of distributed, collaborative development,
as different teams want to design, develop and deploy software in parallel and merge them easily.

Key Terms :

Check in :
 Saving your charges into Version Control .

Check Out :
 Getting the latest version from Version Control.

Conflict :
In general the "Version Control" merges your changes with existing Code automatically, and
merges them automatically , but sometimes the "Versions Control" detect Conflicts, and
the "Version Control" would not be able resolve, it would require a  manual
intervention to resolve the Conflict. 

Merge :
Combining multiple changes made to different working copies of the same files in the
source repository. Merging is a strategy for managing conflicts by letting multiple developers
work at the same time (with no locks on files), and then incorporating their work into one
combined version.

Trunk:
"Trunk" refers to the unnamed branch (version) of a file tree under revision control. The
trunk is usually meant to be the base of a project on which development progresses.

Branching :
Branching, in revision control and software configuration management, is the duplication
of an object under revision control (such as a source code file, or a directory tree) so that
modifications can happen in parallel along both branches.

Back to top