20
https://www.smbc-comics.com/comic/2007-02-03

2007-02-03 · Git Basics 2 - Version 1 and 2 14 git add. Git Basics 3 - Multiple Versions 15 HEAD git commit. Git Basics 4 - Multiple Branches 16 amanda-cool-feature master fix-patricks-bug

  • Upload
    others

  • View
    15

  • Download
    0

Embed Size (px)

Citation preview

Page 1: 2007-02-03 · Git Basics 2 - Version 1 and 2 14 git add. Git Basics 3 - Multiple Versions 15 HEAD git commit. Git Basics 4 - Multiple Branches 16 amanda-cool-feature master fix-patricks-bug

https://www.smbc-comics.com/comic/2007-02-03

Page 2: 2007-02-03 · Git Basics 2 - Version 1 and 2 14 git add. Git Basics 3 - Multiple Versions 15 HEAD git commit. Git Basics 4 - Multiple Branches 16 amanda-cool-feature master fix-patricks-bug

Git 098: Remedial GitPatrick Meade

UW IT Professionals Conference 2019

Page 3: 2007-02-03 · Git Basics 2 - Version 1 and 2 14 git add. Git Basics 3 - Multiple Versions 15 HEAD git commit. Git Basics 4 - Multiple Branches 16 amanda-cool-feature master fix-patricks-bug

Version Control (Movie Scripts)

3

Page 4: 2007-02-03 · Git Basics 2 - Version 1 and 2 14 git add. Git Basics 3 - Multiple Versions 15 HEAD git commit. Git Basics 4 - Multiple Branches 16 amanda-cool-feature master fix-patricks-bug

Version Control (Configuration / Software)

4

Page 5: 2007-02-03 · Git Basics 2 - Version 1 and 2 14 git add. Git Basics 3 - Multiple Versions 15 HEAD git commit. Git Basics 4 - Multiple Branches 16 amanda-cool-feature master fix-patricks-bug

Version Control (Configuration / Software)

5

Page 6: 2007-02-03 · Git Basics 2 - Version 1 and 2 14 git add. Git Basics 3 - Multiple Versions 15 HEAD git commit. Git Basics 4 - Multiple Branches 16 amanda-cool-feature master fix-patricks-bug

Version Control Repository Types

6

Page 7: 2007-02-03 · Git Basics 2 - Version 1 and 2 14 git add. Git Basics 3 - Multiple Versions 15 HEAD git commit. Git Basics 4 - Multiple Branches 16 amanda-cool-feature master fix-patricks-bug

Version Control Editing Types

7

Lock - Modify - Unlock

Page 8: 2007-02-03 · Git Basics 2 - Version 1 and 2 14 git add. Git Basics 3 - Multiple Versions 15 HEAD git commit. Git Basics 4 - Multiple Branches 16 amanda-cool-feature master fix-patricks-bug

Version Control Editing Types

8

Copy - Modify - Merge

Page 9: 2007-02-03 · Git Basics 2 - Version 1 and 2 14 git add. Git Basics 3 - Multiple Versions 15 HEAD git commit. Git Basics 4 - Multiple Branches 16 amanda-cool-feature master fix-patricks-bug

Git

9

Distributed Copy-Modify-Merge

Page 10: 2007-02-03 · Git Basics 2 - Version 1 and 2 14 git add. Git Basics 3 - Multiple Versions 15 HEAD git commit. Git Basics 4 - Multiple Branches 16 amanda-cool-feature master fix-patricks-bug

Trends in Version Control

10

Git

Subversion

CVS

Microsoft Visual Source Safe Jan 2011

Page 11: 2007-02-03 · Git Basics 2 - Version 1 and 2 14 git add. Git Basics 3 - Multiple Versions 15 HEAD git commit. Git Basics 4 - Multiple Branches 16 amanda-cool-feature master fix-patricks-bug

Canonical Repository

11

First Among Equals

Page 12: 2007-02-03 · Git Basics 2 - Version 1 and 2 14 git add. Git Basics 3 - Multiple Versions 15 HEAD git commit. Git Basics 4 - Multiple Branches 16 amanda-cool-feature master fix-patricks-bug

Git Services

12

https://github.com/ https://about.gitlab.com/

Page 13: 2007-02-03 · Git Basics 2 - Version 1 and 2 14 git add. Git Basics 3 - Multiple Versions 15 HEAD git commit. Git Basics 4 - Multiple Branches 16 amanda-cool-feature master fix-patricks-bug

Git Basics 1 - Snapshot of Files

13

git clone

Page 14: 2007-02-03 · Git Basics 2 - Version 1 and 2 14 git add. Git Basics 3 - Multiple Versions 15 HEAD git commit. Git Basics 4 - Multiple Branches 16 amanda-cool-feature master fix-patricks-bug

Git Basics 2 - Version 1 and 2

14

git add

Page 15: 2007-02-03 · Git Basics 2 - Version 1 and 2 14 git add. Git Basics 3 - Multiple Versions 15 HEAD git commit. Git Basics 4 - Multiple Branches 16 amanda-cool-feature master fix-patricks-bug

Git Basics 3 - Multiple Versions

15

HEAD

git commit

Page 16: 2007-02-03 · Git Basics 2 - Version 1 and 2 14 git add. Git Basics 3 - Multiple Versions 15 HEAD git commit. Git Basics 4 - Multiple Branches 16 amanda-cool-feature master fix-patricks-bug

Git Basics 4 - Multiple Branches

16

amanda-cool-feature

master

fix-patricks-bug

HEAD

git checkout fix-patricks-bug

Page 17: 2007-02-03 · Git Basics 2 - Version 1 and 2 14 git add. Git Basics 3 - Multiple Versions 15 HEAD git commit. Git Basics 4 - Multiple Branches 16 amanda-cool-feature master fix-patricks-bug

Git Basics 5 - Tags

17

fix-patricks-bug HEAD

v1.0 v1.1 v2.0

master

git tag -a v2.0

Page 18: 2007-02-03 · Git Basics 2 - Version 1 and 2 14 git add. Git Basics 3 - Multiple Versions 15 HEAD git commit. Git Basics 4 - Multiple Branches 16 amanda-cool-feature master fix-patricks-bug

Pro Git

https://git-scm.com/book/en/v218

Page 19: 2007-02-03 · Git Basics 2 - Version 1 and 2 14 git add. Git Basics 3 - Multiple Versions 15 HEAD git commit. Git Basics 4 - Multiple Branches 16 amanda-cool-feature master fix-patricks-bug

Git Flight Rules

https://github.com/k88hudson/git-flight-rules19

Page 20: 2007-02-03 · Git Basics 2 - Version 1 and 2 14 git add. Git Basics 3 - Multiple Versions 15 HEAD git commit. Git Basics 4 - Multiple Branches 16 amanda-cool-feature master fix-patricks-bug

Git 098: Remedial GitPatrick Meade

UW IT Professionals Conference 2019

^_^ Thank You For Your Kind Attention ^_^