Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Speaker Deck
PRO
Sign in
Sign up
for free
Github in practice
Jaime Arias Almeida
February 06, 2017
Technology
1
67
Github in practice
Talk gave in the Mistis Seminar
Jaime Arias Almeida
February 06, 2017
Tweet
Share
More Decks by Jaime Arias Almeida
See All by Jaime Arias Almeida
himito
0
2
himito
0
9
himito
1
50
himito
1
38
himito
0
100
himito
0
77
himito
0
31
himito
0
81
himito
0
130
Other Decks in Technology
See All in Technology
aditya45
1
680
buildersbox
0
190
ch1aki
2
180
askul
1
190
mamix1116
3
400
viva_tweet_x
3
2.6k
udzura
2
250
buildersbox
0
180
clustervr
0
210
kanaugust
PRO
0
120
oracle4engineer
0
3.6k
ocise
1
1.8k
Featured
See All Featured
62gerente
587
200k
pedronauck
652
110k
addyosmani
1346
190k
kastner
54
1.9k
jakevdp
774
200k
shpigford
165
19k
edds
56
9.4k
dougneiner
119
7.9k
bermonpainter
342
26k
danielanewman
1
520
jcasabona
8
550
kneath
219
15k
Transcript
GITHUB IN PRACTICE Jaime Arias Inria Grenoble Rhône-Alpes February 2017
* Figures in this presentation are inspired by the books listed at the end. 1
WHAT IS GIT? Version control system (VCS) for tracking changes
in computer files and coordinating work on those files among multiple people 2
GITHUB, GITLAB AND COMPANY ≠ Web-based git repository. Provides access
control and collaboration features (i.e., bug tracking, wiki, task management). 3
IT'S TIME TO TAKE THE BULL BY THE HORNS !
4
BASIC CONFIGURATION 5
INITIALIZATION OF AN EMPTY LOCAL REPOSITORY 6
ADDING CHANGES TO THE REPOSITORY 7
ADDING CHANGES TO THE REPOSITORY 8
ADDING CHANGES TO THE REPOSITORY 9
ADDING CHANGES TO THE REPOSITORY 10
ADDING CHANGES TO THE REPOSITORY 11
ADDING CHANGES TO THE REPOSITORY 12
ADDING CHANGES TO THE REPOSITORY 13
ADDING CHANGES TO THE REPOSITORY 14
SHOWING CHANGES AND HISTORY 15
DIFF & LOG The diff command shows the changes that
have been made to the tracked files in the repository since the last commit. The log command shows the commits that have been made so far. 16
DIFF & LOG 17
BRANCHING IN GIT 18
BRANCHING IN GIT 19
BRANCHING IN GIT 20
BRANCHING IN GIT 21
BRANCHING IN GIT 22
INTEGRATE CHANGES 23
MERGING 24
MERGING 25
WHEN SOMETHING IS NOT GOING WELL ... 26
CONFLICT 27
CONFLICT 28
CONFLICT 29
CONFLICT 30
CONFLICT 31
UNDO GIT ADD If you've just asked Git to track
a new file, you can undo the operation by running the reset command. 32
UNDO GIT COMMIT 33
UNDO GIT COMMIT 34
GETTING STARTED IN A TEAM 35
WORKING ON AN EXISTING PROJECT 36
WORKING ON AN EXISTING PROJECT 37
WORKING ON AN EXISTING PROJECT 38
COLLABORATION WORKFLOW 39
UPLOAD LOCAL CHANGES TO THE REMOTE SERVER 40
UPLOAD LOCAL CHANGES TO THE REMOTE SERVER 41
UP-TO-DATE ABOUT REMOTE CHANGES 42
INTEGRATE REMOTE CHANGES 43
PUBLISH A LOCAL BRANCH 44
PUBLISH A LOCAL BRANCH 45
TRACK A REMOTE BRANCH 46
ADVANCED TIPS 47
IGNORING FILES For a useful starting point of files to
ignore, check out gitignore.io 48
FIXING UP THE MOST RECENT COMMIT 49
STASHING YOUR WORK The stash command takes your uncommited changes
and saves them away for later use. 50
THANK YOU FOR YOUR ATTENTION ! 51
FURTHER READING Shaumik Daityari. Jump Start Git: Take Control of
Your Code and Assets. 2015 Emma Jane Hogbin Westby. Git for Teams: A User-Centered Approach to Creatin Efficient Workflows in Git. 2015 Mike McQuaid. Git in Practice: Includes 66 Techniques. 2015 Git Documentation: https://git-scm.com 52