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
Git <> Codies
Search
Stella Miranda
October 25, 2018
Education
0
54
Git <> Codies
Stella Miranda
October 25, 2018
Tweet
Share
More Decks by Stella Miranda
See All by Stella Miranda
Pioneras Developers Barranquilla
stellamiranda
0
36
RailsGirlsCali
stellamiranda
0
14
bogotajs
stellamiranda
0
36
GDG-WTM
stellamiranda
0
70
Coderise 2015
stellamiranda
0
35
Coding like a girl
stellamiranda
1
12
devise-authy demo
stellamiranda
0
88
Other Decks in Education
See All in Education
LinkedIn
matleenalaakso
0
3.5k
Carving the Way to Ruby Engineering
koic
3
800
Zero to Hero
takesection
0
150
Information Architectures - Lecture 2 - Next Generation User Interfaces (4018166FNR)
signer
PRO
0
1.4k
Генезис казарменной архитектуры
pnuslide
0
190
XML and Related Technologies - Lecture 7 - Web Technologies (1019888BNR)
signer
PRO
0
2.7k
Introduction - Lecture 1 - Advanced Topics in Big Data (4023256FNR)
signer
PRO
1
1.7k
ISMS審査準備ブック_サンプル【LRM 情報セキュリティお役立ち資料】
lrm
0
1.1k
ヘイトスピーチがある世界のコミュニケーション
ktanishima
0
890
JAWS-UGを通じてアウトプット活動を楽しんでみませんか? #jawsug_tochigi
masakiokuda
0
160
1030
cbtlibrary
0
340
2024年度秋学期 統計学 第11回 分布の「型」を考える - 確率分布モデルと正規分布 (2024. 12. 4)
akiraasano
PRO
0
110
Featured
See All Featured
Chrome DevTools: State of the Union 2024 - Debugging React & Beyond
addyosmani
3
310
We Have a Design System, Now What?
morganepeng
51
7.4k
Git: the NoSQL Database
bkeepers
PRO
427
64k
Docker and Python
trallard
44
3.3k
CoffeeScript is Beautiful & I Never Want to Write Plain JavaScript Again
sstephenson
160
15k
How To Stay Up To Date on Web Technology
chriscoyier
790
250k
How GitHub (no longer) Works
holman
313
140k
Optimizing for Happiness
mojombo
376
70k
Templates, Plugins, & Blocks: Oh My! Creating the theme that thinks of everything
marktimemedia
29
2.2k
How STYLIGHT went responsive
nonsquared
98
5.3k
A Modern Web Designer's Workflow
chriscoyier
693
190k
Become a Pro
speakerdeck
PRO
26
5.1k
Transcript
None
None
Version control with Git
Github vs. GitLab vs. Bitbucket
Github
What is your current version control system?
What is your current version control system? 1. How do
you manage different file versions? 2. How do you work with collaborators on the same files? 3. How much would your science suffer if your workstation exploded right now? (scale from 1-10)
What is git • Version control system. • Manage different
versions of files. • Collaborate with yourself. • Collaborate with other people.
Why use git “Always remember your first collaborator is your
future self, and your past self doesn’t answer emails” - Christie Bahlai
What is git good for? Backup Reproducibility Collaboration Organization Transparency
Command line git
Initializing a repository Prerequisites: ▶ git installed (check with which
git) ▶ git configured (check with git config --list) git config --global user.name "Vlad Dracula" git config --global user.email "
[email protected]
" git config --global color.ui "auto" git config --global core.editor "nano"
Initializing a repository git git init
Checking repository status git status
Adding your file git add your_filename.R or, to add everything
git add --all
Ignoring files .gitignore
Adding a remote repository git remote add origin
[email protected]
:Codies/trygit.gitt
Checking repository status git status
None
Committing Once you’re sure that you’re changes are worth saving
(THIS WILL GO ON YOUR PERMANENT RECORD) git commit -m 'changed x, y, and z'
Commit messages ▶ Describe why and the what “in a
nutshell” ▶ Note to your future self (and to anyone else who you’re collaborating with)
Checking repository status git status
What did we do? git status git log
Make another change 1. Change file 2. Add changes 3.
Commit changes 4. View updated log
Branches
Pull Request Let’s do one!
Fix conflicts
Saving temporary your changes git stash git stash happy
Moving a commit to another branch git cherry-pick
Merging branches git merge
Rebase vs Merge git merge vs git rebase
Squashing commits git rebase -i HEAD~2
Gracias! - @codies_latam - @codiescolombia - /LadiesAndCode