Merge pull request from yurimalheiros/version-control-questions Answers some version control questions