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
情報処理工学問題集 /infoeng_practices
kfujita
0
280
Future Trends and Review - Lecture 12 - Web Technologies (1019888BNR)
signer
PRO
0
2.6k
AWS Well-Architected Labを活用してつよつよAWSエンジニアになろう!!! #jawsug_tokyo
masakiokuda
0
300
1113
cbtlibrary
0
290
(説明資料)オンラインゆっくり相談室
ytapples613
PRO
0
120
(モブ)エンジニアが伝えるアウトプット活動のススメ!! #カンリーLT
masakiokuda
2
190
書を持って、自転車で町へ出よう
yuritaco
0
140
ニュースメディアにおける生成 AI の活用と開発 / UTokyo Lecture Business Introduction
upura
0
230
Padlet opetuksessa
matleenalaakso
4
13k
Ch4_-_Cours_2.pdf
bernhardsvt
0
130
新人研修の課題と未来を考える
natsukokanda1225
0
1.3k
複式簿記から純資産を排除する/eliminate_net_assets_from_double-entry_bookkeeping
florets1
0
300
Featured
See All Featured
Fight the Zombie Pattern Library - RWD Summit 2016
marcelosomers
232
17k
Documentation Writing (for coders)
carmenintech
67
4.6k
[RailsConf 2023] Rails as a piece of cake
palkan
53
5.2k
The Cult of Friendly URLs
andyhume
78
6.2k
The Myth of the Modular Monolith - Day 2 Keynote - Rails World 2024
eileencodes
20
2.4k
Scaling GitHub
holman
459
140k
Designing for humans not robots
tammielis
250
25k
For a Future-Friendly Web
brad_frost
176
9.5k
BBQ
matthewcrist
86
9.5k
Code Reviewing Like a Champion
maltzj
521
39k
Put a Button on it: Removing Barriers to Going Fast.
kastner
60
3.7k
XXLCSS - How to scale CSS and keep your sanity
sugarenia
248
1.3M
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