DEAD-SIMPLE VERSION CONTROL FOR YOUR TEAM GIT WITH MATTHEW REIDSMA GRAND VALLEY STATE UNIVERSITY

Transcription

1 DEAD-SIMPLE VERSION CONTROL FOR YOUR TEAM WITH GIT MATTHEW REIDSMA GRAND VALLEY STATE UNIVERSITY

2 WHO DOESN T USE VERSION CONTROL?

3 VERSION CONTROL WHO?

4 OH BOY.

5 WHY YOU NEED VERSION CONTROL

6 GIT

7 GIT

8 WHY GIT IS AWESOME

9 HOW GIT WORKS

10 WORKING DIRECTORY

11 WORKING DIRECTORY add INDEX (STAGING AREA)

12 WORKING DIRECTORY add INDEX (STAGING AREA) commit LOCAL REPOSITORY

13 WORKING DIRECTORY add INDEX (STAGING AREA) commit LOCAL REPOSITORY push REMOTE REPOSITORY

14 My-Computer: mreidsma$ _

15 SCARY My-Computer: mreidsma$ _

16

17 $cd MyAwesomeApp

18 $cd MyAwesomeApp $touch index.html

19 $cd MyAwesomeApp $touch index.html $git init Initialized empty Git repository in /MyAwesomeApp/.git/

20 $cd MyAwesomeApp $touch index.html $git init Initialized empty Git repository in /MyAwesomeApp/.git/ $git add.

21 $cd MyAwesomeApp $touch index.html $git init Initialized empty Git repository in /MyAwesomeApp/.git/ $git add. $git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # #! new file: index.html #

22

23 $git commit -m First commit [master (root-commit) 7ce2952] First commit 1 file changed, 2 insertions(+) create mode index.html

24 $git commit -m First commit [master (root-commit) 7ce2952] First commit 1 file changed, 2 insertions(+) create mode index.html $git remote add origin git@github.com:gvsulib/ awesomeapp.git

25 $git commit -m First commit [master (root-commit) 7ce2952] First commit 1 file changed, 2 insertions(+) create mode index.html $git remote add origin git@github.com:gvsulib/ awesomeapp.git $git push origin master

26

27 BRANCHING

28 [master]

29 [master]

30 [master]

31 [master]

32 [master]

33 [master] [branch]

34 [master] [branch]

35 [master] merge [branch]

36 BRANCHES ARE CHEAP

37

38 $cd MyAwesomeApp

39 $cd MyAwesomeApp $git branch newfeature

40 $cd MyAwesomeApp $git branch newfeature $git checkout newfeature Switched to branch newfeature

41 $cd MyAwesomeApp $git branch newfeature $git checkout newfeature Switched to branch newfeature <!-- AWESOME FEATURE ADDING ACTION HERE -->

42 $cd MyAwesomeApp $git branch newfeature $git checkout newfeature Switched to branch newfeature <!-- AWESOME FEATURE ADDING ACTION HERE --> $git add.

43 $cd MyAwesomeApp $git branch newfeature $git checkout newfeature Switched to branch newfeature <!-- AWESOME FEATURE ADDING ACTION HERE --> $git add. $git status # On branch newfeature # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # #! modified: index.html #

44

45 $git commit -m Best feature ever [newfeature 18q7d58] Best feature ever 1 file changed, 1 insertions(+)

46 $git commit -m Best feature ever [newfeature 18q7d58] Best feature ever 1 file changed, 1 insertions(+) $git checkout master Switched to branch master

47 $git commit -m Best feature ever [newfeature 18q7d58] Best feature ever 1 file changed, 1 insertions(+) $git checkout master Switched to branch master $git merge newfeature Updating 7ce q7d58 index.html file changed, 1 insertion(+)

48 BUT YOU CHANGED THE FILE

49 WORKFLOWS

50 LOCAL

51 LOCAL REMOTE

52 LOCAL LOCAL

53 LOCAL REMOTE LOCAL

54 LOCAL WEB SERVER REMOTE LOCAL

55 LOCAL WEB SERVER REMOTE LOCAL

56 HOW WE DO GVSU

57

58

59 GITHUB

60 GITHUB WEB SERVER

61 MASTER IS ALWAYS DEPLOYABLE

62

63 $ssh

64 $ssh $git mkdir MyAwesomeApp

65 $ssh $git mkdir MyAwesomeApp $git cd MyAwesomeApp

66 $ssh $git mkdir MyAwesomeApp $git cd MyAwesomeApp $git clone awesomeapp.git Cloning into awesomeapp... remote: Counting objects: 1, done. remote: Compressing objects: 100% (1/1), done. remote: Total 1 (delta 21), reused 1 (delta 14) Unpacking objects: 100% (1/1), done.

67

68 $ssh

69 $ssh $git cd MyAwesomeApp

70 $ssh $git cd MyAwesomeApp $git pull origin master

71 BUT

72

73

74

75 OTHER FANCY FEATURES

76 .gitignore

77 diff

78 log

79 filter-branch

80 stash

81 reset

82 RESOURCES Download git Git Reference Git and Github Bootcamp John Fink: A Gentle Introduction to Modern Version Control Flashbake - automated git for writers

83

84 THANK