日益複雜的程式碼，您的團隊如何應對？若您具備 Git 基礎，來參加就對了！ 從需求到實作，從測試到上線。本工作坊將針對數種情境，帶您動手實際演練。 活動結束後，可以設計出適合自己的 Git 流程，降低溝通、開發和部署成本。 http://coscup2015.kktix.cc/events/h4-gitlab-flow

2. COSCUP :
Git Workflows
Hacking Thursday
Carl Su
CC BY 4.0

3. Hacking Thursday

4. • Skalde
• Hacker
• COSCUP Hacking Thursday
• H4

5. ……

8. https://www.facebook.com/groups/hackingday/
https://hackingthursday.hackpad.com/

9. •
•
• Git Flow
• GitHub Flow
• GitLab Flow

10. Git

11. bare repository
• central repository
•
• .git
• GitHub bare repository

12. • working directory
• local repository
• git clone
• git init Git repository

13. Git
• git remote: bare repository
• git fetch: remote
• git pull: git fetch git merge
• git push: remote

14. https://goo.gl/YXhzdV

15. • Documents
• coscup2015_workshop
• bare repository
• h4_workshop.git
• .git
• john_h4_workshop, mary_h4_workshop

16. merge

17. John README push

18. Mary LICENSE push

19. Rejected (fetch first)
To /home/hackingthursday/Documents/h4_workshop.git
! [rejected] master -> master (fetch first)

20. Mary fetch push

21. Rejected (non-fast-forward)
To /home/hackingthursday/Documents/h4_workshop.git
! [rejected] master -> master (non-fast-forward)

22. Mary merge push

23. Merged (non-fast-forward)
Merge made by the 'recursive' strategy.
README.md | 1 +
1 file changed, 1 insertion(+)
create mode 100644 README.md

24. Fast-forward
•
•
•
• rebase
No fast-forward
•
•
• (merge)
• commit
fast-forward v.s. no fast-forward

25. pull --rebase

26. John LICENSE push

27. Mary README push

28. Rejected (fetch first)
To /home/hackingthursday/Documents/h4_workshop.git
! [rejected] master -> master (fetch first)

29. Mary pull --rebase push

30. Merged (pull --rebase)
First, rewinding head to replay your work on top of it...
Applying: Add agenda section in README

31. • Git
• fetch pull
• Fast-forward no fast-forward
• Bare repository working directory
• merge rebase

32. •
• Try Git
• Learn Git Branching
•
• Pro Git
• Git

33. feature branch

34. •
•
•
•
• Git

35. •
•
•

36. Git Flow
A successful Git branching model

38. • master
• develop

39. • Feature branches
• Release branches
• Hotfix branches

40. Feature branches
• develop
• develop
•
• feature/<featureA>
• add-copyright-
holders

41. Release branches
• develop
• develop master
•
• release-* release/*

42. Hotfix branches
• master
• develop master
•
• hotfix-* hotfix/*

43. • develop
•
• release
• feature hotfix
• release

44. GitHub Flow
Introduced by GitHub

45. GitHub Flow
• fork / create a branch
• add commits
• open a pull request
• discuss and review your code
• deploy and merge

46. Fork repository or create a branch

47. Add commits

48. Open a pull request

49. Discuss and review your code

50. Deploy and merge

51. GitLab Flow
Production / Environment / Release branch

52. Production branch
• deploy
•
• production Git Flow
master

53. Environment branch
•
•
•

54. Release branch
•
• hotfix cherry-pick
• production

55. •
•
•

56. • https://www.atlassian.com/git/tutorials/comparing-
workflows/
• https://git-scm.com/book/en/v2/Git-Branching-Basic-
Branching-and-Merging
• http://nvie.com/posts/a-successful-git-branching-
model/
• https://guides.github.com/introduction/flow/
• https://about.gitlab.com/2014/09/29/gitlab-flow/