Introduction to Version Control with Git

These are the slides used in my Skillshare workshop on Introduction to Version Control

Transcript

1. Git Introduction to Version Control @willame_soares
2. Front-end Developer Bachelor of Computer Science Write posts at dev.to and my blog willamesoares.com willamesoares @willame_soares
3. Course Overview ❏ Who is this course for? ❏ What is the goal of the course? ❏ How progress will be measured?
4. Prerequisites
5. Prerequisites - text editor - comfortable with the command line
6. Let’s get started!
7. History of Version Control Tools ❏ Problem: tracking files efficiently ❏ Limitations: concurrent work ❏ Centralized vs Distributed
8. History of Version Control Tools Centralized ❏ central server ❏ subtrees ❏ can be slow Distributed ❏ local copy ❏ work offline ❏ fast
9. History of Version Control Tools Centralized Source: git-scm.com
10. History of Version Control Tools Distributed Source: git-scm.com
11. History of Version Control Tools Centralized subversion CVS Concurrent Version System
12. History of Version Control Tools Distributed Git Bazaar Mercurial
13. Git Created by Linus Torvalds in 2005 as an alternative to BitKeeper
14. What and How ❏ Distributed version control system ❏ Most operations are local ❏ Uses snapshots ❏ Creates SHA-1 hashes based on file content 31c4e1d01bac28de52aed1a2d83f422a3dbea8d5
15. Git and Github setup
16. Install git Ubuntu $ sudo apt-get install git-all
17. Install git Mac $ git --version … or you can go to http://git-scm.com/download/mac
18. Install git
19. Install git Windows http://git-scm.com/download/mac
20. Check git installation $ git --version
21. git config ❏ System wide configuration: --system ❏ User specific configuration: --global ❏ Project specific configuration: --local
22. git config $ git config --global user.name “John Doe” $ git config --global user.email “john.doe@example.com” Username and email
23. git config $ git config --global core.editor atom Text editor
24. git config $ git config --list Check configuration $ git config user.email $ git config --global --list $ git config --system --list
25. git config $ git config --global alias.cfg config Create aliases $ git config --global color.ui true Colored user interface $ git config credential.helper store Save credentials
26. Working areas Working Directory Staging Area (index) Repository .git Modified files Staged files Committed files
27. First things first
28. Branches
29. Creating git repositories $ mkdir hello-world && cd hello-world Create your own $ git init Now you have your .git directory! $ git init hello-world or
30. Creating git repositories $ git clone https://github.com/willamesoares/git-intro.git Fetch an existing repository $ cd git-intro
31. Forking existing git repositories
32. Forking an existing repository
33. Modifying and adding files $ touch hello-world.txt $ git status Creating a file
34. Working directory Staging area Git repository hello-world.txt
35. Modifying and adding files $ git add hello-world.txt $ git status Creating a file
36. Working directory Staging area Git repository hello-world.txt add
37. Commit ❏ Hash ❏ Message ❏ Author and date
38. Commit Working Directory Staging Area (index) Repository .git Modified files Staged files Committed files commit
39. Committing your changes $ git commit -m “Add file to start listing greetings” $ git show
40. Listing commits $ git log
41. commit Working directory Staging area Git repository hello-world.txt commit 374b6...
42. Pushing changes $ git push origin master
43. Pushing changes
44. Pushing changes
45. Branches master 32080.. 374b6...
46. Branches $ git branch feature1 $ git checkout feature1 $ git checkout -b feature1 Or
47. Branches master 32080.. 374b6... feature1 New branch feature1 created
48. Branches $ touch hello-world2.txt $ git commit -m “New version of hello-world file”
49. Branches master 32080.. 374b6... feature1 6a826.. New commit created in feature1
50. Branches master 32080.. 374b6... feature1 6a826.. 14cb3... New commit created in master
51. Branches $ git checkout master $ git merge feature1
52. Branches master 32080.. 374b6... feature1 6a826.. 14cb3... Merge commit New merge commit
53. Branches $ git checkout master $ git rebase feature1
54. Branches master 32080.. 374b6... feature1 6a826.. 14cb3... Commits replayed on top of each other
55. Conflicts may happen! master 32080.. 374b6... feature1 You are here
56. $ echo “Hello” > README.md $ git add README.md $ git commit “Update README.md to say Hello” Conflicts may happen! You update README.md and commit your changes
57. $ git checkout master $ echo “Ola” > README.md $ git add README.md $ git commit “Update README.md to say Ola” Conflicts may happen! Then you move back to master branch and update README.md as well
58. $ git merge feature1 Conflicts may happen! Then you try to merge your feature1 branch into master branch
59. $ git diff Conflicts may happen! If you check the contents of that file...
60. Conflicts may happen! Steps 1. Open the file with conflicts in your editor of preference 2. Update it as you want and save it 3. Now, the file will be in your working directory, but this time if you check its contents... $ git diff
61. Conflicts may happen! Steps 5. Move file to the staging area 6. Continue with merge process $ git add README.md $ git merge --continue
62. Conflicts are solved!
63. Course project overview
64. Project 1. Fork the repo located here https://github.com/willamesoares/git-intro 2. Clone the forked repo to your local machine 3. Edit the CONTRIBUTORS.md file by adding your full name to it 4. Create a commit and send it to your master branch 5. Use the github interface to open a pull request $ git remote add upstream https://github.com/willamesoares/git-intro.git
65. Thank you!
66. References and useful links https://git-scm.com https://betterexplained.com/articles/a-visual-guide-to-version-control/ https://rhodecode.com/insights/version-control-systems-2016 http://guides.beanstalkapp.com/version-control/intro-to-version-control.ht ml
67. References and useful links https://blog.thoughtram.io/git/2014/11/18/the-anatomy-of-a-git-commit.h tml https://try.github.io/levels/1/challenges/1 http://www.vogella.com/tutorials/Git/article.html https://www.learnenough.com/git-tutorial
68. Thank you! willamesoares.com willamesoares @willame_soares