Git Flow and Coding Style discusses Git merge vs Git rebase and JavaScript coding style. It explains how Git merge creates a new commit when merging branches while Git rebase replays commits from one branch onto another branch without creating additional merge commits. It recommends rebasing the master branch and testing before creating a pull request. It also discusses the Airbnb JavaScript style guide as a good reference for code examples and styles including ES6 standards. Yoda conditions are mentioned as a style to avoid assignment errors in conditional statements. Writing unit tests is suggested to prevent coding errors.

1. Git Flow and Coding Style
Bo-Yi Wu
2015/04/10

2. Agenda
• Git merge vs Git rebase.
• JavaScript Coding Style.

3. Git merge vs Git rebase

4. Git merge
• Create your branch
– $ git checkout –b ‘response’
• Merge from develop branch
– $ git merge develop

6. git merge develop

8. New commit
Merge branch 'develop' into response (HEAD, response)

10. git merge develop again

12. New commit
Merge branch 'develop' into response (HEAD, response)

13. git checkout develop
git merge --no-ff response

15. Git rebase
• Create your branch
– $ git checkout –b ‘response’
• Merge from master branch
– $ git rebase develop

17. Git rebase master

19. No more new commit log

20. Git rebase master again

22. No more new commit log

23. Create your new Pull Request
git merge --no-ff respnse

25. git rebase vs git merge
network graph

27. Rebase vs Merge 優缺點
rebase merge
避免過多 merge commit log 產生 merge commit log
Branch commit log 排到最前面(方便追蹤) 依照時間排序 commit log
network graph 清楚 network graph 不易理解
各別 commit 解決 conflict 一次將全部衝突顯示
可任意修改 commit log
可合併多個 commit (避免過多無意義
commit log)

28. Rebase vs Merge 使用時機
rebase merge
整理 Branch commit log 主分支記錄合併 xxxx branch
非主分支開發無需記錄何時合併主分支
主分支請勿使用 rebase 合併任何分支

29. Develop Note
Please rebase master branch and test again
before creating new Pull Request

30. JavaScript Coding Style Guide

31. 原先架構
https://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml

32. Google JavaScript Style Guide
無任何範例可參考

33. Airbnb JavaScript Style Guide
https://github.com/airbnb/javascript

34. Airbnb JavaScript Style Guide
程式碼範例完整
另外也可以參考 ES6 Branch

35. Yoda Conditions
https://en.wikipedia.org/wiki/Yoda_conditions
if ($a === ‘1’) {
// code block
}
if (‘1’ === $a) {
// code block
}
程式閱讀性高 程式閱讀性低

36. Yoda Conditions
https://en.wikipedia.org/wiki/Yoda_conditions
if ($a = ‘1’) {
// code block
}
避免此種情況發生

37. How to prevent the condition?
Write Unit Test

38. Thanks