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
490
SSH Can
oursky
1
310
HTTP/2
oursky
0
340
watchOS2
oursky
0
320
Common QA issues
oursky
0
200
Complex is better than complicated
oursky
0
280
Clean code again
oursky
3
360
KiriKiri x O2 x NVLMarker
oursky
0
230
Flux + React
oursky
1
380
Other Decks in Programming
See All in Programming
Go Conference 2025: Goで体感するMultipath TCP ― Go 1.24 時代の MPTCP Listener を理解する
takehaya
9
1.7k
kiroとCodexで最高のSpec駆動開発を!!数時間で web3ネイティブなミニゲームを作ってみたよ!
mashharuki
0
150
CSC305 Lecture 04
javiergs
PRO
0
270
The Past, Present, and Future of Enterprise Java
ivargrimstad
0
310
Six and a half ridiculous things to do with Quarkus
hollycummins
0
170
Server Side Kotlin Meetup vol.16: 内部動作を理解して ハイパフォーマンスなサーバサイド Kotlin アプリケーションを書こう
ternbusty
3
180
Android16 Migration Stories ~Building a Pattern for Android OS upgrades~
reoandroider
0
100
技術的負債の正体を知って向き合う / Facing Technical Debt
irof
0
160
Go言語はstack overflowの夢を見るか?
logica0419
0
200
私達はmodernize packageに夢を見るか feat. go/analysis, go/ast / Go Conference 2025
kaorumuta
2
540
AI Coding Meetup #3 - 導入セッション / ai-coding-meetup-3
izumin5210
0
3.3k
Flutterで分数(Fraction)を表示する方法
koukimiura
0
130
Featured
See All Featured
jQuery: Nuts, Bolts and Bling
dougneiner
65
7.9k
Rebuilding a faster, lazier Slack
samanthasiow
84
9.2k
GraphQLとの向き合い方2022年版
quramy
49
14k
Gamification - CAS2011
davidbonilla
81
5.5k
Intergalactic Javascript Robots from Outer Space
tanoku
273
27k
Music & Morning Musume
bryan
46
6.8k
How to Think Like a Performance Engineer
csswizardry
27
2k
How STYLIGHT went responsive
nonsquared
100
5.8k
Reflections from 52 weeks, 52 projects
jeffersonlam
352
21k
The Cost Of JavaScript in 2023
addyosmani
54
9k
ReactJS: Keep Simple. Everything can be a component!
pedronauck
667
120k
Visualization
eitanlees
149
16k
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