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 Lesson
Search
Oursky Limited
November 22, 2011
Programming
5
550
Git Lesson
Things try to avoid at GitHub. Rule of thumb when you are using Git.
Oursky Limited
November 22, 2011
Tweet
Share
More Decks by Oursky Limited
See All by Oursky Limited
UI Automation
oursky
1
480
SSH Can
oursky
1
300
HTTP/2
oursky
0
330
watchOS2
oursky
0
310
Common QA issues
oursky
0
190
Complex is better than complicated
oursky
0
270
Clean code again
oursky
3
360
KiriKiri x O2 x NVLMarker
oursky
0
220
Flux + React
oursky
1
370
Other Decks in Programming
See All in Programming
『自分のデータだけ見せたい!』を叶える──Laravel × Casbin で複雑権限をスッキリ解きほぐす 25 分
akitotsukahara
2
640
Discover Metal 4
rei315
2
130
Rails Frontend Evolution: It Was a Setup All Along
skryukov
0
140
PipeCDのプラグイン化で目指すところ
warashi
1
270
Flutterで備える!Accessibility Nutrition Labels完全ガイド
yuukiw00w
0
160
システム成長を止めない!本番無停止テーブル移行の全貌
sakawe_ee
1
200
イベントストーミング図からコードへの変換手順 / Procedure for Converting Event Storming Diagrams to Code
nrslib
2
810
データの民主化を支える、透明性のあるデータ利活用への挑戦 2025-06-25 Database Engineering Meetup#7
y_ken
0
360
AI コーディングエージェントの時代へ:JetBrains が描く開発の未来
masaruhr
1
140
VS Code Update for GitHub Copilot
74th
2
640
PicoRuby on Rails
makicamel
2
130
「Cursor/Devin全社導入の理想と現実」のその後
saitoryc
0
820
Featured
See All Featured
Art, The Web, and Tiny UX
lynnandtonic
299
21k
How GitHub (no longer) Works
holman
314
140k
ReactJS: Keep Simple. Everything can be a component!
pedronauck
667
120k
Building an army of robots
kneath
306
45k
How to Think Like a Performance Engineer
csswizardry
25
1.7k
Fight the Zombie Pattern Library - RWD Summit 2016
marcelosomers
233
17k
Designing for humans not robots
tammielis
253
25k
Evolution of real-time – Irina Nazarova, EuRuKo, 2024
irinanazarova
8
820
Refactoring Trust on Your Teams (GOTO; Chicago 2020)
rmw
34
3.1k
The Cost Of JavaScript in 2023
addyosmani
51
8.5k
Statistics for Hackers
jakevdp
799
220k
Imperfection Machines: The Place of Print at Facebook
scottboms
267
13k
Transcript
Git And possible workflow Tuesday, 22 November, 11
versioning control tools Originally for programmer Evolved for Designer too!
Tuesday, 22 November, 11
Why git? Fast Everything local Enable more Workflow!!!! Tuesday, 22
November, 11
GitHub Model Fork and branch Make changes Pull Request Integration
Manager Workflow Tuesday, 22 November, 11
Lesson learned What you should avoid at pull request Tuesday,
22 November, 11
git merge Merge hell Don’t merge at pull request. Don’t
reuse branch. New Branch or Rebase! Tuesday, 22 November, 11
git rebase Rebase will kill the history. I appear so
productive at 15 Nov! Some issue tracker will go crazy.... Rebase public branch? Tuesday, 22 November, 11
Remove password! git filter-branch --index-filter 'git rm --cached --ignore-unmatch Rakefile'
HEAD git push origin master --force All branch must be rebase! github will cached the password, open a support ticket.... Tuesday, 22 November, 11
Revert merge ---o---o---o---M---x---x---W / ---A---B ---o---o---o---M---x---x---W---x / ---A---B-------------------C---D A and
B are bad, use “git revert -m 1 M”(W) to revert C and D fix the bugs introduced by A and B. Tuesday, 22 November, 11
Two way Revert W Redo A B ---o---o---o---M---x---x-------x-------* / /
---A---B-------------------C---D ---o---o---o---M---x---x---W---x---x---Y---* / \ / ---A---B A'--B'--C' Tuesday, 22 November, 11
Consideration Try no to reverting too much Small commit is
easier for bisect Revert a commit, not a merge. Linus on merge: ftp://82.96.64.7/pub/software/scm/git/ docs/v1.6.3.3/howto/revert-a-faulty-merge.txt Tuesday, 22 November, 11
Rule of thumb Branch more Keep branch small Merge frequent
Tuesday, 22 November, 11