1. Introduction to Git - Chirag Dani

2. Objectives Basics of Git Understanding different “Mindset of Git” Demo - Git with Visual Studio

3. From where to get? Free download available for Windows, Linux and Mac OS http://git-scm.com/

4. Centralized and Distributed Centralized SVN CVS TFS VSS Distributed Git Mercurial Bazaar

5. Centralized Version Control - Locking

6. Centralized Version Control - Merge

7. Distributed Version Control

8. Centralized Version Control One master copy of project Only master has latest revision Only works till central server is available and online

9. Distributed Version Control Local copy of repository and full history Use branches to work on changes Work offline with local repository

10. Tools Visual Studio Git Bash Atlassian Source Tree Github and many more …

11. Repository Git Init Git Add Git Clone Magic hidden folder:.git – do not modify Two files:.gitattributes.gitignore

12. Branching Strategy “Each branch in itself is a repository” PRSD Project Strategy Master Develop Feature/ Hotfix

13. Branch Create a new branch Switch to another branch Checkout is different than TFS

14. Working Directory Tracked files Unmodified Modified Staged Untracked files Everything else Files in your working directory Tracked Untracked

15. File Status Lifecycle

16. Pushing a branch For example, I created a branch – goodidea If I want to share it, I need to push it Git Push goodidea git push

17. Basic merge conflicts Pauses the merge commit Git status shows unmerged conflicts Resolve & Commit Useful Commands: git add git mergetool git status git commit

18. Conflict What does a conflict look like? <<<<<<< HEAD:index.html contact : clientservices@nwcadence.com ======= please contact us at services@nwcadence.com >>>>>>> story:index.html

19. How to resolve conflict? Merge Rebase

20. Resolved Conflict Using both HEAD and story please contact us at clientservices@nwcadence.com

21. Save work Commit Push Pull Request – Code Review Merge Delete

22. Git Bash

23. Queries

24. Thank You