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
530
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
430
SSH Can
oursky
1
250
HTTP/2
oursky
0
290
watchOS2
oursky
0
210
Common QA issues
oursky
0
150
Complex is better than complicated
oursky
0
230
Clean code again
oursky
3
310
KiriKiri x O2 x NVLMarker
oursky
0
160
Flux + React
oursky
1
330
Other Decks in Programming
See All in Programming
2 週間で Twitter Bot を作ってみた
contour_gara
0
560
Rubyでたのしむクリエイティブコーディング/Enjoy Creative coding with Ruby
chobishiba
1
180
ADRを一年運用してみた/adr_after_a_year
hanhan1978
7
2.4k
Git Lint
bkuhlmann
4
750
VSCodeでのDatabricks開発もお勧めしたい/I would also recommend Databricks development with VSCode.
kazumain
0
260
初心者のためのRubyKaigi入門/RubyKaigi Introduction
a_matsuda
2
850
Goのmultiple errorsについて (2024年4月版)
syumai
4
930
Fragment Composition of GraphQL
quramy
7
1k
Anthropic Cookbook のおすすめレシピ
schroneko
7
980
try!Swift Tokyo 2024 参加報告 LT
akidon0000
1
220
大規模Reactアプリのリアーキテクチャ~8万行のTanStack Query移行の軌跡~
kj455
4
970
SIMD Parallel Programming with the Vector API
josepaumard
0
180
Featured
See All Featured
Music & Morning Musume
bryan
41
5.6k
Designing on Purpose - Digital PM Summit 2013
jponch
110
6.5k
Web development in the modern age
philhawksworth
202
10k
Let's Do A Bunch of Simple Stuff to Make Websites Faster
chriscoyier
501
140k
Rails Girls Zürich Keynote
gr2m
91
13k
KATA
mclloyd
15
12k
Become a Pro
speakerdeck
PRO
11
4.5k
Designing with Data
zakiwarfel
96
4.8k
Pencils Down: Stop Designing & Start Developing
hursman
117
11k
What’s in a name? Adding method to the madness
productmarketing
PRO
16
2.6k
Build The Right Thing And Hit Your Dates
maggiecrowley
24
2k
Templates, Plugins, & Blocks: Oh My! Creating the theme that thinks of everything
marktimemedia
19
1.7k
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