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 201
Search
Dimitris Tsironis
May 31, 2013
Technology
0
150
Git 201
Branching Models basic, Merging & how Github's pull request work
Dimitris Tsironis
May 31, 2013
Tweet
Share
More Decks by Dimitris Tsironis
See All by Dimitris Tsironis
How to Develop Backbone Plugins (...for the greater good!)
tsironis
0
170
Modern Webapps
tsironis
1
88
Automating your workflow with Grunt
tsironis
2
180
Git 101
tsironis
0
200
Capistrano for non-Rubyists
tsironis
4
130
HTML+CSS: how to get started
tsironis
1
70
Coffeescript: unfancy javascript
tsironis
2
420
Coffescript - take a sip of code
tsironis
4
160
Startup Weekend Next Presentation
tsironis
2
160
Other Decks in Technology
See All in Technology
本当のガバクラ基礎
toru_kubota
0
300
iThome2024 Wailing Wall of Enterprise Security
notsurprised
0
270
本番環境で Cloudflareを 使ってみた話
miu_crescent
2
120
パフォーマンス最適化のベストプラクティス
databricksjapan
0
190
TypescriptでのContextualな構造化ロギングと社内全体への導入
leveragestech
3
540
技術力の伸ばし方を考える
khirata
0
130
Deno で作る快適な “as Code” プラットフォーム – TSKaigi 2024
pizzacat83
4
300
パスワードを保存しますか?
hanacchi
0
240
TDD - Test Driven Drupal
opdavies
0
3k
AWSの生成AI入門書を執筆しました🎉
minorun365
PRO
0
120
TypeScript の抽象構文木を用いた、数百を超える API の大規模リファクタリング戦略
yanaemon
6
1.2k
SWC Transformerから見るTypeScript関数記述ベストプラクティス
fujiyamaorange
1
170
Featured
See All Featured
Optimizing for Happiness
mojombo
370
69k
Scaling GitHub
holman
457
140k
The Invisible Customer
myddelton
114
12k
RailsConf 2023
tenderlove
9
580
From Idea to $5000 a Month in 5 Months
shpigford
377
45k
Into the Great Unknown - MozCon
thekraken
15
1.1k
Intergalactic Javascript Robots from Outer Space
tanoku
266
26k
JavaScript: Past, Present, and Future - NDC Porto 2020
reverentgeek
41
4.5k
Understanding Cognitive Biases in Performance Measurement
bluesmoon
12
1.1k
Art, The Web, and Tiny UX
lynnandtonic
290
19k
Responsive Adventures: Dirty Tricks From The Dark Corners of Front-End
smashingmag
245
20k
StorybookのUI Testing Handbookを読んだ
zakiyama
13
4.7k
Transcript
Git 201 FreeFriday @ Teipir
Real quick...
Dimitris Tsironis Front-end Engineer at BugSense, JavaScript lover || hater,
Open-source & (Coffee)Script addict, Technology afficcionado
Previously on Free Fridays...
How can we work more effectively in a team?
Introducing Branching have multiple versions of the same project work
async & simultaneously safer & more clean way to do things very “cheap” branches
Git This is where the Git magic is happening!
creating a branch $ git branch <new-branch-name> # Creates a
new branch $ git checkout <new-branch-name> # Switch to new branch $ git branch # Check your local branches
creating a branch #2 # Creates a new branch and
switches to it immediately $ git checkout -b <new-branch-name>
Now, you can code as hard as you can!
Cool story, bro! But, how can we move our code
to our main branch and continue with our lives?
Merging Merge two branches Keep the chances you want to
keep You’re in control It’s easier in Git than in other VCS
merging a local branch $ git checkout <dest-branch> # Switch
to destination $ git merge <branch-name> # Merge the specified branch $ git log # Check if everything is fine
Once you’ve finished... You should do some housekeeping!
deleting a branch # Deletes branch, but keeps commits $
git branch -d <branch-name> # Force deletes everything, both branch and its commits $ git branch -D <branch-name> # USE WISELY!!
The Github way How Github handles branches & merging
Branches on Github Nothing special here Push your branches on
Github Has some awesome tools for branches
pushing to Github # Push branch on Github $ git
push origin <branch-name>
Pull Requests A nice, Web 2.0 way to handle merges,
branch and working in a team
Pull requests Promoting collaboration Encouraging open source contributions (fork) Discussing
features & changes on the go Merge without hassle and delete the branch
The real power is in the details! Let’s see...
Pull requests: reloaded Discussion for almost everything Can be created
before coding starts You have a timeline history of commits Forum-like functionality lots of integrations and extra tools
Extra tig (apt-get install tig, brew install tig) Github Help
Git basics presentation Git documentation
And, as always, practice, practice, PRACTICE!
Thanks! @tsironakos