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
Deterministic Finite Automata
himito
0
3
Journée Respire - CI/CD at LIPN
himito
0
8
Software Heritage key infrastructure for Open Science and Software Science
himito
0
22
CosyVerif: The Path to Formalisms Cohabitation
himito
0
38
Towards a Rewriting Logic Semantics for Interactive Scores
himito
0
39
ICFEM2022
himito
0
96
Hybrid Parallel Model Checking of Hybrid LTL on Hybrid State Space Representation
himito
0
110
25 Years - AVISPA: Specification and Verification of Interactive Multimedia Systems
himito
0
86
Continuous Integration & Deployment
himito
1
100
Other Decks in Technology
See All in Technology
新卒(ほぼ)専業Kagglerという選択肢
nocchi1
1
2.4k
モバイルアプリ研修
recruitengineers
PRO
4
900
コスト削減の基本の「キ」~ コスト消費3大リソースへの対策 ~
smt7174
2
240
開発と脆弱性と脆弱性診断についての話
su3158
1
1.2k
DeNA での思い出 / Memories at DeNA
orgachem
PRO
3
1.8k
【 LLMエンジニアがヒューマノイド開発に挑んでみた 】 - 第104回 Machine Learning 15minutes! Hybrid
soneo1127
0
150
JOAI発表資料 @ 関東kaggler会
joai_committee
1
430
Go で言うところのアレは TypeScript で言うとコレ / Kyoto.なんか #7
susisu
7
2k
事業価値と Engineering
recruitengineers
PRO
6
3.9k
生成AI利用プログラミング:誰でもプログラムが書けると 世の中どうなる?/opencampus202508
okana2ki
0
200
新規案件の立ち上げ専門チームから見たAI駆動開発の始め方
shuyakinjo
0
330
Devinを使ったモバイルアプリ開発 / Mobile app development with Devin
yanzm
0
200
Featured
See All Featured
ピンチをチャンスに:未来をつくるプロダクトロードマップ #pmconf2020
aki_iinuma
126
53k
What’s in a name? Adding method to the madness
productmarketing
PRO
23
3.6k
Automating Front-end Workflow
addyosmani
1370
200k
Product Roadmaps are Hard
iamctodd
PRO
54
11k
Building Flexible Design Systems
yeseniaperezcruz
328
39k
Code Reviewing Like a Champion
maltzj
525
40k
CSS Pre-Processors: Stylus, Less & Sass
bermonpainter
358
30k
Performance Is Good for Brains [We Love Speed 2024]
tammyeverts
10
1k
RailsConf & Balkan Ruby 2019: The Past, Present, and Future of Rails at GitHub
eileencodes
139
34k
Fantastic passwords and where to find them - at NoRuKo
philnash
51
3.4k
Raft: Consensus for Rubyists
vanstee
140
7.1k
The Illustrated Children's Guide to Kubernetes
chrisshort
48
50k
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