Git Workshop 20130720
-
Upload
yamane-toshiaki -
Category
Documents
-
view
189 -
download
0
description
Transcript of Git Workshop 20130720
![Page 1: Git Workshop 20130720](https://reader035.fdocument.pub/reader035/viewer/2022081907/5494100dac79592f2e8b4a6f/html5/thumbnails/1.jpg)
Git(hub) Workshop
2013.7.20
@yamanetoshi
![Page 2: Git Workshop 20130720](https://reader035.fdocument.pub/reader035/viewer/2022081907/5494100dac79592f2e8b4a6f/html5/thumbnails/2.jpg)
ヤること1. branch して merge する workflow2. conflict を解消する方法3. Fork しない PullRequest の練習4. Github Flow を試してみよう
どこまでできるのかは不明
![Page 3: Git Workshop 20130720](https://reader035.fdocument.pub/reader035/viewer/2022081907/5494100dac79592f2e8b4a6f/html5/thumbnails/3.jpg)
branch して merge する workflow1. master から branch します git checkout -b <new branch>2. branch で commit を作ります git commit3. master を最新にします git checkout master git fetch git merge origin/master 4. master に feature branch を merge git merge <new branch> --no-ff
![Page 4: Git Workshop 20130720](https://reader035.fdocument.pub/reader035/viewer/2022081907/5494100dac79592f2e8b4a6f/html5/thumbnails/4.jpg)
Github で試してみましょう
デキる人はブラウザではない方法で
![Page 5: Git Workshop 20130720](https://reader035.fdocument.pub/reader035/viewer/2022081907/5494100dac79592f2e8b4a6f/html5/thumbnails/5.jpg)
あとgit commit は
-m せずに使いましょう
![Page 6: Git Workshop 20130720](https://reader035.fdocument.pub/reader035/viewer/2022081907/5494100dac79592f2e8b4a6f/html5/thumbnails/6.jpg)
conflict の解消
![Page 7: Git Workshop 20130720](https://reader035.fdocument.pub/reader035/viewer/2022081907/5494100dac79592f2e8b4a6f/html5/thumbnails/7.jpg)
お手本を見せますのでペアを組んで
意図的に作った衝突を解消してみましょう
![Page 8: Git Workshop 20130720](https://reader035.fdocument.pub/reader035/viewer/2022081907/5494100dac79592f2e8b4a6f/html5/thumbnails/8.jpg)
git でブランチをマージした時にコンフリクトを起こしてしまったら
http://goo.gl/TdSTw
![Page 9: Git Workshop 20130720](https://reader035.fdocument.pub/reader035/viewer/2022081907/5494100dac79592f2e8b4a6f/html5/thumbnails/9.jpg)
題材: Numbershttp://goo.gl/2KKHt
![Page 10: Git Workshop 20130720](https://reader035.fdocument.pub/reader035/viewer/2022081907/5494100dac79592f2e8b4a6f/html5/thumbnails/10.jpg)
Fork しない方式の Pull Request 演習
http://goo.gl/KOBLC
![Page 11: Git Workshop 20130720](https://reader035.fdocument.pub/reader035/viewer/2022081907/5494100dac79592f2e8b4a6f/html5/thumbnails/11.jpg)
広島 Git 勉強会 - 番外編 Github Flow してみるhttp://goo.gl/xLS6O
![Page 12: Git Workshop 20130720](https://reader035.fdocument.pub/reader035/viewer/2022081907/5494100dac79592f2e8b4a6f/html5/thumbnails/12.jpg)
参考まで:小規模開発には git-flow
よりも GitHub Flow で捗る
http://goo.gl/1NzIe
![Page 13: Git Workshop 20130720](https://reader035.fdocument.pub/reader035/viewer/2022081907/5494100dac79592f2e8b4a6f/html5/thumbnails/13.jpg)
もうひとつ:こんなのもあります
http://goo.gl/gCsWs
![Page 14: Git Workshop 20130720](https://reader035.fdocument.pub/reader035/viewer/2022081907/5494100dac79592f2e8b4a6f/html5/thumbnails/14.jpg)
忘れてました:これ、ヤッてみませんか ?
http://goo.gl/GWEvs