1. Version Control Systems academy.zariba.com 1

2. Lecture Content 1.What is Software Configuration Management? 2.Version Control Systems (VCS) 3.Basic Git Commands 4.Merging and Branching 5.Creating a repository 6.Simple Phaser Demo 7.Source Tree 8.VCS in WebStorm 2

3. 3 What is Software Configuration Management (SCM)? SCM’s task is to keep track and controlling changes in the software. Revision Control, Source Control and Version Control.

4. Version Control Systems (VCS) 4

5. Workflow Basically, the workflow goes like this: After that you can push your files from the HEAD to the remote master (or branch). 5

6. 6 Creating a repository

7. Basic git commands git init – create a new git repository. git remote add origin - connect your repository to a remote server. git clone - clone a repository from a remote server. git add - add specific file/files to the index. git add. – add all modified files to the index. git commit –m “message” – commit files to the HEAD with a specific message. git push origin master – send the changes from the HEAD to the server. git tag - tagging a specific commit with a version. git log --author=vankata --pretty=oneline --graph --oneline --decorate --all --name-status - check the repository history. git checkout -- - replace changes in the working tree with the last content in HEAD. git fetch origin – download locally the latest origin master. git reset --hard origin/master – reset the local master to remote origin master. 7

8. Merging and Branching git checkout –b - create a new branch. git push origin - push changes to branch git checkout master – switch back to master git branch –d - delete branch git pull – update your local repository to the newest commit. git merge - merge your local repository to a specific branch git diff - preview differences in branches 8

9. Simple Phaser demo 9 1. Create a simple demo with Phaser 2. Initial commit of the project 3. Preview of the basic Git Commands

10. Source Tree 10

11. VCS in WebStorm 11

12. 12 References 1.http://rogerdudler.github.io/git-guide/ 2.https://en.wikipedia.org/wiki/Software_configuration_ management

13. 13 Zariba Academy Questions