Git is a version control system.
Git is free software distributed under GPL.
Git has a mutable index called stage.
Git tracks changes of files.
create a new branch -- dev.
Merge branch may be with conflicts.

Merge branch without fast forward model.