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
74
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
Hybrid Parallel Model Checking of Hybrid LTL on Hybrid State Space Representation
himito
0
16
25 Years - AVISPA: Specification and Verification of Interactive Multimedia Systems
himito
0
11
Continuous Integration & Deployment
himito
1
33
Hunting Moby Dick: An introduction to Docker at LIPN
himito
1
81
Git: A Distributed Revision Control System
himito
1
68
Hunting Moby Dick: An Introduction to Docker
himito
0
110
PyHRF: A Python Library for the Analysis of fMRI Data Based on Local Estimation of Hemodynamic Response Function
himito
0
95
A tree-based Operational Semantics for Interactive Multimedia Scores
himito
0
37
Creating Static Sites with Pelican
himito
0
150
Other Decks in Technology
See All in Technology
Dagu | オンプレ向けワークフローエンジン(WebUI 同梱)
yohamta
0
180
1年間のポストモーテム運用とそこから生まれたツール sre-advisor / SRE NEXT 2022
fujiwara3
6
3.2k
Poolにおける足を止めないシステム基盤構築
winebarrel
3
830
Oracle Database Technology Night #55 Oracle Autonomous Database 再入門
oracle4engineer
PRO
1
120
ドキュメントの翻訳に必要なこと
mayukosawai
0
160
Oracle Cloud Infrastructure:2022年5月度サービス・アップデート
oracle4engineer
PRO
0
110
Oracle Content Management サービス概要 (2022年5月版)
oracle4engineer
PRO
0
110
AWS ChatbotでEC2インスタンスを 起動できるようにした
iwamot
0
150
220521_SFN_品質文化試論と『LEADING QUALITY』/220521_SFN_Essay_of_Quality_Culture_and_LEADING_QUALITY
mkwrd
0
250
CADDi HCMC Technology Center
caddi_eng
0
250
プルリク作ったらデプロイされる仕組み on ECS / SRE NEXT 2022
carta_engineering
1
260
アルプの 認証/認可分離戦略と手法
ma2k8
PRO
2
310
Featured
See All Featured
Reflections from 52 weeks, 52 projects
jeffersonlam
337
17k
Design by the Numbers
sachag
271
17k
Building Applications with DynamoDB
mza
83
4.6k
Navigating Team Friction
lara
175
11k
BBQ
matthewcrist
74
7.9k
I Don’t Have Time: Getting Over the Fear to Launch Your Podcast
jcasabona
12
890
Atom: Resistance is Futile
akmur
255
20k
The Power of CSS Pseudo Elements
geoffreycrofte
46
3.9k
The Art of Programming - Codeland 2020
erikaheidi
31
5.8k
Documentation Writing (for coders)
carmenhchung
48
2.5k
Bootstrapping a Software Product
garrettdimon
295
110k
CoffeeScript is Beautiful & I Never Want to Write Plain JavaScript Again
sstephenson
151
12k
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