How to Git Better Using Git Workflows (with some help from Atlasssian)

Transcription

1 NERDS 28 May 2015 How to Git Better Using Git Workflows (with some help from Atlasssian)

2 Why should we Git Better? Software Craftsmanship You are as proficient as you are familiar with your tools You are more likely to cut yourself with a dull knife than a sharp one

3 Fair Warning: Fancy Git Talk ahead Requires decent understanding of Git branches Lots of Pictures Available Git up to Speed Brown Bag (before 22 June)

4 NEWSFLASH! Git is not Version Control! You: Umm so what is it then? Git is a set of tools that provides a workflow for your version control. You: Umm and that means what exactly? Use Git to customize your team s way of using version control in your daily development.

5 MIND = BLOWN

6 MIND = BLOWN

7 Popular Workflows for Git This is well treaded territory in industry Documented in Confluence on DEVLAN 1. Centralized 2. Feature Branch 3. Git Flow 4. Forking

8 Popular Workflows for Git This is well treaded territory in industry Documented in Confluence on DEVLAN 1. Centralized 2. Feature Branch 3. Git Flow 4. Forking (see Confluence)

9 Centralized (and why it s bad)

10 Centralized (and why it s bad)

11 Centralized (and why it s bad)

12 Typical Git 3-Way Merge

13 Typical Git 3-Way Merge

14 Centralized (and why it s bad) Everyone for themselves! Errors compounded Knowledge partitioning Clear history Lack of project organization No efforts to improve quality built into workflow

15 Solution: Modify Workflow

16 Solution: Modify Workflow Keep master clean! No direct commits No broken builds No partial features Merges only

17 Solution: Modify Workflow Keep master clean! No direct commits No broken builds No partial features Merges only Code Review of changes by team before merge

18 Solution: Modify Workflow Keep master clean! No direct commits No broken builds No partial features Merges only Code Review of changes by team before merge Clear history

19 Solution: Modify Workflow Keep master clean! No direct commits No broken builds No partial features Merges only Code Review of changes by team before merge Clear history Clear improvements to quality

20 Feature Branching - A Branch Per Feature

21 Feature Branching - A Branch Per Feature

22 Feature Branching - Pull Requests

23 Feature Branching - Pull Requests

24 Feature Branching - Pull Requests

25 Feature Branching - Pull Requests

26 Feature Branching - Pull Requests

27 Feature Branching - Pull Requests

28 Feature Branching Pull Requests give us: A stable master branch protected from chaos Digestible pieces of Code Review Knowledge sharing / Collective code ownership Clear history of changes Clear improvements made But how about long term projects?

29 Git Flow, or How I Became OCD about DVCS

30 Git Flow: Historical Branches master contains stable delivered versions only develop is for stable incorporation of new features

31 Git Flow: Historical Branches master contains stable delivered versions only develop is for stable incorporation of new features

32 Git Flow: Feature Branches New features incorporated (by feature branching!) into develop

33 Git Flow: Feature Branches Branch from develop Pull Request to merge into develop

34 Git Flow: Feature Branches Branch from develop Pull Request to merge into develop

35 Git Flow: Release Branches Release candidates executed in separate release branch No new features only fixes

36 Git Flow: Release Branches Release candidates executed in separate release branch No new features only fixes

37 Git Flow: Release Branches Release candidates executed in separate release branch No new features only fixes

38 Git Flow: Release Branches Release candidates executed in separate release branch No new features only fixes

39 Git Flow: Hotfix Branches Branch for applying hotfixes (perfect for Discrepancy Reports) Merge into master and develop

40 Git Flow: Hotfix Branches Branch for applying hotfixes (perfect for Discrepancy Reports) Merge into master and develop

41 How Atlasssian Helps Track all issues in Jira Create feature branch from each Jira issue

42 How Atlasssian Helps Track all issues in Jira Create feature branch from each Jira issue Merge feature branch in Stash using Pull Requests

43 Questions?

44 Questions? GO FORTH AND ROCK