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
540
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
440
SSH Can
oursky
1
260
HTTP/2
oursky
0
300
watchOS2
oursky
0
250
Common QA issues
oursky
0
170
Complex is better than complicated
oursky
0
240
Clean code again
oursky
3
320
KiriKiri x O2 x NVLMarker
oursky
0
180
Flux + React
oursky
1
340
Other Decks in Programming
See All in Programming
connect-go で面倒くささと戦う / 2024-08-27 #newmo_layerx_go
izumin5210
2
650
Findy - エンジニア向け会社紹介 / Findy Letter for Engineers
findyinc
4
90k
Evolution of real-time – Irina Nazarova, EuRuKo, 2024
irinanazarova
0
120
Shinjuku.rb#95:心の技術書紹介
free_world21
1
110
Rubyのobject_id
qnighy
6
1.3k
長期運用プロダクトの開発速度を維持し続けるためのリファクタリング実践例
wataruss
8
2.7k
Composing an API the *right* way (Droidcon New York 2024)
zsmb
2
100
How to Break into Reading Open Source
kaspth
2
220
Scala におけるコンパイラエラーとの付き合い方
chencmd
2
430
What you can do with Ruby on WebAssembly
kateinoigakukun
0
170
あなたのアプリ、ログはでてますか?あるいはログをだしてますか? (Funabashi.dev用 軽量版)
uzulla
2
120
o1モデルのプロンプトエンジニアリングって?
ktc_wada
0
270
Featured
See All Featured
How to train your dragon (web standard)
notwaldorf
85
5.6k
XXLCSS - How to scale CSS and keep your sanity
sugarenia
246
1.3M
RailsConf & Balkan Ruby 2019: The Past, Present, and Future of Rails at GitHub
eileencodes
131
32k
How to Ace a Technical Interview
jacobian
274
23k
Making Projects Easy
brettharned
113
5.8k
Java REST API Framework Comparison - PWX 2021
mraible
PRO
27
7.4k
Intergalactic Javascript Robots from Outer Space
tanoku
268
26k
Clear Off the Table
cherdarchuk
91
320k
Rebuilding a faster, lazier Slack
samanthasiow
78
8.6k
Become a Pro
speakerdeck
PRO
22
4.9k
Distributed Sagas: A Protocol for Coordinating Microservices
caitiem20
326
21k
Atom: Resistance is Futile
akmur
261
25k
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