Software engineering
Software
Computer programming
Version control
Configuration management
Merge
Plastic SCM
Diff3
Git
Apache Subversion
Branching
Mercurial