Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Features
Speaker Deck
PRO
Sign in
Sign up for free
Search
Search
Github in practice
Search
Jaime Arias Almeida
February 06, 2017
Technology
1
130
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
Software Heritage key infrastructure for Open Science and Software Science
himito
0
9
CosyVerif: The Path to Formalisms Cohabitation
himito
0
25
Towards a Rewriting Logic Semantics for Interactive Scores
himito
0
27
ICFEM2022
himito
0
91
Hybrid Parallel Model Checking of Hybrid LTL on Hybrid State Space Representation
himito
0
100
25 Years - AVISPA: Specification and Verification of Interactive Multimedia Systems
himito
0
72
Continuous Integration & Deployment
himito
1
91
Hunting Moby Dick: An introduction to Docker at LIPN
himito
1
260
Git: A Distributed Revision Control System
himito
1
140
Other Decks in Technology
See All in Technology
テストアーキテクチャ設計で実現する高品質で高スピードな開発の実践 / Test Architecture Design in Practice
ropqa
3
280
EDRからERM: PFN-SIRTが関わるセキュリティとリスクへの取り組み
pfn
PRO
0
130
教師なし学習の基礎
kanojikajino
4
380
オーティファイ会社紹介資料 / Autify Company Deck
autifyhq
10
120k
Bounded Context: Problem or Solution?
ewolff
1
180
パフォーマンスとコスト改善のために法人データ分析基盤をBigQueryに移行した話
seiya303
1
110
生成AIを活用した機能を、顧客に提供するまでに乗り越えた『4つの壁』
toshiblues
2
270
[JAWS-UG栃木]地方だからできたクラウドネイティブ事例大公開! / jawsug_tochigi_tachibana
biatunky
0
170
例外処理を理解して、設計段階からエラーを「見つけやすく」「起こりにくく」する
kajitack
13
4.3k
FastConnect の冗長性
ocise
1
9.3k
[2025クラウドガバナンスはこう変わる!マルチアカウント運用のre:Invent最新情報と活用例] re:Invent 2024 から見る AWS マルチアカウントガバナンスのこれまでとこれから
0nihajim
0
110
Ask! NIKKEIの運用基盤と改善に向けた取り組み / NIKKEI TECH TALK #30
kaitomajima
0
160
Featured
See All Featured
The Pragmatic Product Professional
lauravandoore
32
6.4k
Evolution of real-time – Irina Nazarova, EuRuKo, 2024
irinanazarova
6
520
Bash Introduction
62gerente
610
210k
Build your cross-platform service in a week with App Engine
jlugia
229
18k
How To Stay Up To Date on Web Technology
chriscoyier
790
250k
YesSQL, Process and Tooling at Scale
rocio
171
14k
The Cost Of JavaScript in 2023
addyosmani
47
7.3k
Facilitating Awesome Meetings
lara
51
6.2k
"I'm Feeling Lucky" - Building Great Search Experiences for Today's Users (#IAC19)
danielanewman
226
22k
Designing for humans not robots
tammielis
250
25k
Fashionably flexible responsive web design (full day workshop)
malarkey
406
66k
The Art of Programming - Codeland 2020
erikaheidi
53
13k
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