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
270
HTTP/2
oursky
0
300
watchOS2
oursky
0
270
Common QA issues
oursky
0
170
Complex is better than complicated
oursky
0
250
Clean code again
oursky
3
330
KiriKiri x O2 x NVLMarker
oursky
0
180
Flux + React
oursky
1
340
Other Decks in Programming
See All in Programming
Realtime API 入門
riofujimon
0
150
3rd party scriptでもReactを使いたい! Preact + Reactのハイブリッド開発
righttouch
PRO
1
610
Macとオーディオ再生 2024/11/02
yusukeito
0
370
Tauriでネイティブアプリを作りたい
tsucchinoko
0
370
聞き手から登壇者へ: RubyKaigi2024 LTでの初挑戦が 教えてくれた、可能性の星
mikik0
1
130
카카오페이는 어떻게 수천만 결제를 처리할까? 우아한 결제 분산락 노하우
kakao
PRO
0
110
Streams APIとTCPフロー制御 / Web Streams API and TCP flow control
tasshi
2
350
What’s New in Compose Multiplatform - A Live Tour (droidcon London 2024)
zsmb
1
480
ローコードSaaSのUXを向上させるためのTypeScript
taro28
1
630
ペアーズにおけるAmazon Bedrockを⽤いた障害対応⽀援 ⽣成AIツールの導⼊事例 @ 20241115配信AWSウェビナー登壇
fukubaka0825
6
2k
よくできたテンプレート言語として TypeScript + JSX を利用する試み / Using TypeScript + JSX outside of Web Frontend #TSKaigiKansai
izumin5210
6
1.7k
Jakarta EE meets AI
ivargrimstad
0
220
Featured
See All Featured
Facilitating Awesome Meetings
lara
50
6.1k
The MySQL Ecosystem @ GitHub 2015
samlambert
250
12k
Measuring & Analyzing Core Web Vitals
bluesmoon
4
130
Learning to Love Humans: Emotional Interface Design
aarron
273
40k
Designing for humans not robots
tammielis
250
25k
The Invisible Side of Design
smashingmag
298
50k
Code Reviewing Like a Champion
maltzj
520
39k
The Language of Interfaces
destraynor
154
24k
How To Stay Up To Date on Web Technology
chriscoyier
788
250k
Optimizing for Happiness
mojombo
376
70k
Designing on Purpose - Digital PM Summit 2013
jponch
115
7k
Put a Button on it: Removing Barriers to Going Fast.
kastner
59
3.5k
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