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
260
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
GitHub Actionsのキャッシュと手を挙げることの大切さとそれに必要なこと
satoshi256kbyte
5
390
Nuxtベースの「WXT」でChrome拡張を作成する | Vue Fes 2024 ランチセッション
moshi1121
1
510
シールドクラスをはじめよう / Getting Started with Sealed Classes
mackey0225
3
400
go.mod、DockerfileやCI設定に分散しがちなGoのバージョンをまとめて管理する / Go Connect #3
arthur1
10
2.4k
Kotlin2でdataクラスの copyメソッドを禁止する/Data class copy function to have the same visibility as constructor
eichisanden
1
130
レガシーな Android アプリのリアーキテクチャ戦略
oidy
1
170
JaSST 24 九州:ワークショップ(は除く)実践!マインドマップを活用したソフトウェアテスト+活用事例
satohiroyuki
0
260
WEBエンジニア向けAI活用入門
sutetotanuki
0
300
Sidekiqで実現する 長時間非同期処理の中断と再開 / Pausing and Resuming Long-Running Asynchronous Jobs with Sidekiq
hypermkt
6
2.7k
Vue SFCのtemplateでTypeScriptの型を活用しよう
tsukkee
3
1.5k
詳細解説! ArrayListの仕組みと実装
yujisoftware
0
480
約9000個の自動テストの 時間を50分->10分に短縮 Flakyテストを1%以下に抑えた話
hatsu38
23
11k
Featured
See All Featured
How GitHub (no longer) Works
holman
311
140k
How to Ace a Technical Interview
jacobian
275
23k
A Philosophy of Restraint
colly
203
16k
Building a Scalable Design System with Sketch
lauravandoore
459
33k
10 Git Anti Patterns You Should be Aware of
lemiorhan
654
59k
Unsuck your backbone
ammeep
668
57k
Testing 201, or: Great Expectations
jmmastey
38
7k
Producing Creativity
orderedlist
PRO
341
39k
Why You Should Never Use an ORM
jnunemaker
PRO
53
9k
Keith and Marios Guide to Fast Websites
keithpitt
408
22k
[RailsConf 2023 Opening Keynote] The Magic of Rails
eileencodes
28
9.1k
実際に使うSQLの書き方 徹底解説 / pgcon21j-tutorial
soudai
167
49k
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