git is a distributed version control system.
git is a free software distributed under GPL.
git tracks changes.
checkout to dev.; change on brance conflict, then change on master.
test merge with --no-ff