Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Speaker Deck
PRO
Sign in
Sign up
for free
Git Lesson
Oursky Limited
November 22, 2011
Programming
5
510
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
oursky
1
400
oursky
1
230
oursky
0
230
oursky
0
130
oursky
0
110
oursky
0
190
oursky
3
260
oursky
0
110
oursky
1
270
Other Decks in Programming
See All in Programming
numeroanddev
1
230
grapecity_dev
1
190
manfredsteyer
PRO
0
120
abeta
1
200
sansuke05
1
140
grapecity_dev
0
180
konstantin_diener
0
130
manfredsteyer
PRO
0
150
borkdude
2
200
oracle4engineer
0
100
heistak
2
130
rarous
0
170
Featured
See All Featured
jakevdp
775
200k
rasmusluckow
318
18k
gr2m
83
11k
shlominoach
176
7.5k
moore
125
21k
garrettdimon
288
110k
brad_frost
157
6.4k
destraynor
222
47k
reverentgeek
167
7.3k
samlambert
237
10k
danielanewman
200
20k
bryan
31
3.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