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
Dev ContainersとGitHub Codespacesの素敵な関係
ymd65536
1
130
Vaporモードを大規模サービスに最速導入して学びを共有する
kazukishimamoto
4
4.3k
弊社の「意識チョット低いアーキテクチャ」10選
texmeijin
5
23k
AWS IaCの注目アップデート 2024年10月版
konokenj
3
3.1k
プロジェクト新規参入者のリードタイム短縮の観点から見る、品質の高いコードとアーキテクチャを保つメリット
d_endo
1
1k
cXML という電子商取引の トランザクションを支える プロトコルと向きあっている話
phigasui
3
2.3k
Identifying User Idenity
moro
6
7.9k
RailsのPull requestsのレビューの時に私が考えていること
yahonda
5
1.7k
Java ジェネリクス入門 2024
nagise
0
600
Server Driven Compose With Firebase
skydoves
0
400
破壊せよ!データ破壊駆動で考えるドメインモデリング / data-destroy-driven
minodriven
16
4.1k
Vue SFCのtemplateでTypeScriptの型を活用しよう
tsukkee
3
1.5k
Featured
See All Featured
Exploring the Power of Turbo Streams & Action Cable | RailsConf2023
kevinliebholz
27
4.2k
Large-scale JavaScript Application Architecture
addyosmani
510
110k
Side Projects
sachag
452
42k
Distributed Sagas: A Protocol for Coordinating Microservices
caitiem20
328
21k
The Psychology of Web Performance [Beyond Tellerrand 2023]
tammyeverts
41
2.1k
Six Lessons from altMBA
skipperchong
26
3.5k
CSS Pre-Processors: Stylus, Less & Sass
bermonpainter
355
29k
Templates, Plugins, & Blocks: Oh My! Creating the theme that thinks of everything
marktimemedia
26
2.1k
How to Think Like a Performance Engineer
csswizardry
19
1.1k
GraphQLとの向き合い方2022年版
quramy
43
13k
Designing for humans not robots
tammielis
249
25k
RailsConf & Balkan Ruby 2019: The Past, Present, and Future of Rails at GitHub
eileencodes
131
33k
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