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
220
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
170
Flux + React
oursky
1
330
Other Decks in Programming
See All in Programming
勉強会4_アップデートされたAssistantsAPIを試す
milky04
0
890
GitHub Actionsの痒いところを埋めるサードパーティーランナー
dora1998
2
290
TypeScriptとGraphQLで実現する 型安全なAPI実装 / TSKaigi 2024
hokaccha
5
2.9k
[RailsConf Detroit 2024] Ruby on Fails - effective error handling with Rails conventions
talyssonoc
0
300
地方こそサーバーレス、その意義に迫るサーバーレスPHP / Serverless PHP: The Rural Areas, and Why Serverless PHP Matters
seike460
PRO
2
110
RuboCop: LSP and Prism
koic
2
130
“Seeing Like a Programmer”—Resiliency, Limits, and Moral Hazards in Software Engineering (LambdaConf 2024)
chriskrycho
0
450
Implementing Design Systems in Swift
seyfoyun
2
530
HonoのRPCで真の型安全が欲しかった
kosei28
1
170
Powerfully Typed TypeScript
euxn23
4
1.8k
The Final Frontier of Web Development: React Server Components vs Jakarta EE
ivargrimstad
0
240
Using "modern" Ruby to build a better, faster Homebrew
mikemcquaid
2
310
Featured
See All Featured
The Invisible Side of Design
smashingmag
294
49k
The Language of Interfaces
destraynor
151
23k
Refactoring Trust on Your Teams (GOTO; Chicago 2020)
rmw
26
2.3k
Bootstrapping a Software Product
garrettdimon
PRO
302
110k
Design and Strategy: How to Deal with People Who Don’t "Get" Design
morganepeng
117
18k
What's in a price? How to price your products and services
michaelherold
238
11k
jQuery: Nuts, Bolts and Bling
dougneiner
60
7.2k
For a Future-Friendly Web
brad_frost
172
9k
RailsConf 2023
tenderlove
9
590
CSS Pre-Processors: Stylus, Less & Sass
bermonpainter
352
28k
Save Time (by Creating Custom Rails Generators)
garrettdimon
PRO
1
140
Optimising Largest Contentful Paint
csswizardry
13
2.4k
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