Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Sign up for free
Menu
Search
Features
All features
Private URLs
Password Protection
Custom URLS
Scheduled publishing
Remove Branding
Restrict embedding
Deck Collections
Notes
Features
All features
Private URLs
Password Protection
Custom URLS
Scheduled publishing
Remove Branding
Restrict embedding
Deck Collections
Notes
Explore
Featured decks
Featured speakers
Programming
Technology
Storyboards
Explore
Featured decks
Featured speakers
Programming
Technology
Storyboards
Pricing
Search
Sign in
Sign up for free
Github in practice
Search
Sponsored
·
SiteGround - Reliable hosting with speed, security, and support you can count on.
→
Jaime Arias Almeida
February 06, 2017
Technology
150
1
Share
Embed
Copy iframe code
Copy JS code
Copy link
Start on current slide
Github in practice
Talk gave in the Mistis Seminar
Jaime Arias Almeida
February 06, 2017
Transcript
52 slides
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
More Decks by Jaime Arias Almeida
See All by Jaime Arias Almeida
Vue.js : Développer des interfaces utilisateur réactives et modulaires
himito
0
33
De zéro à votre première application web avec AdonisJS
himito
0
32
Creating Static Sites with Pelican at LIPN
himito
0
37
CosyVerif : Vers une Cohabitation des Formalismes: Séminaire des 20 ans de MeFoSyLoMa
himito
0
26
Heure ProDev : AdonisJS
himito
0
30
Journée Vue.js
himito
0
55
Preserving the World’s Software: A Hands-On Introduction to Software Heritage
himito
0
32
Deterministic Finite Automata
himito
0
55
Journée Respire - CI/CD at LIPN
himito
0
30
Other Decks in Technology
See All in Technology
メルカリの小規模チーム「Pod」で、 エンジニアがデータアナリストなしで、 AIを使ってデータ分析の自走を目指す取り組み
jackojacko_
0
290
AIネイティブ組織の作り方。1人のPOとAIから始める、自社での実験
ama_ch
2
1.2k
Agent Routerで作るマルチテナント 推論基盤 #CNDW2026 / Building Multi-Tenant Inference Platform with Agent Router #CNDW2026
everpeace
4
520
エンタープライズ事業未経験のデータ屋、 AI時代にN回撃沈する.pdf
ryoskdara_
0
170
認知の質も文化醸成も。数年取り組んで見えてきた技術広報のKPI設計 / Tech PR KPIs: Lessons on Awareness Quality and Culture After Several Years
bitkey
PRO
0
140
飯から始まるデータエンジニア
sansantech
PRO
0
120
Linuxネットワークスタック進化の軌跡: 過去10年の歩みと最新トレンド
orimanabu
4
770
2026-11-16 JAWS-UG コンテナ支部 #31 ゆるLT大会 ECR のライフサイクルポリシーを いい感じに設定したい / ECR Lifecycle policy
masasuzu
3
580
「任されビリティ」で引き受けて「よしなりてぃ」に頼らず任せる / Accept tasks with "makasarebility" and hand them over without relying on "yoshinarily"
pauli
1
860
E2E Test というハーネス — AI時代の自動テスト民主化
daishukojima
10
5.9k
AWS DevOps Agentの構造から読み解く運用 AI エージェントの設計原則/aws-devops-agent-design-principles
tomoki10
0
150
PHPで家庭用ゲーム機の専用コントローラーをMIDIデバイスとして扱ってみる
wind111
0
170
Featured
See All Featured
Neural Spatial Audio Processing for Sound Field Analysis and Control
skoyamalab
0
630
HTML-Aware ERB: The Path to Reactive Rendering @ RubyCon 2026, Rimini, Italy
marcoroth
6
960
Designing Powerful Visuals for Engaging Learning
tmiket
1
660
A Tale of Four Properties
chriscoyier
163
24k
Agile that works and the tools we love
rasmusluckow
331
22k
The Cost Of JavaScript in 2023
addyosmani
56
10k
Sharpening the Axe: The Primacy of Toolmaking
bcantrill
46
3.1k
Web Performance Is a Journey [PerfNow 2026]
tammyeverts
2
78
How Software Deployment tools have changed in the past 20 years
geshan
3
35k
New Earth Scene 8
popppiees
5
2.9k
Writing Fast Ruby
sferik
630
63k
Taking LLMs out of the black box: A practical guide to human-in-the-loop distillation
inesmontani
PRO
3
2.5k