Presentation on GitFlow, SourceTree and GitLab

1. GitFlow
SourceTree
GitLab
Shinu Suresh

2. QA
Development
Branches Production

3. Main Branches
 Develop
 master

4. Supporting branches
Feature Release Hotfix

5. Branch naming
 Feature – Anything except master, develop, release-*, hotfix-*
Eg:- Qas, Autosuggest, ScrollableProducts etc
 Release – Release-*
Eg:- Release-v1.0.0 (Follow semver), Release-Woody, Release-CheckoutV2 etc
For more information on semver - http://semver.org/
 Hotfix – Hotfix-*
Eg:- Hotfix-v1.0.0-PLPIssue, Hotfix-1.0-JIRA-1928 etc
 Tag
Eg:- Tag-v1.0.0 (Following semver), Tag-Woody etc

6. SourceTree
 Atlassian Product
 Perfect for Newbies
 GitFlow integration

7. Configuration
 Git User Name
 Git Email
 Git Private Key
Public key
To be copied over to gitlab

8. SourceTree Dashboard
Your
Cloned
Repos
Local
Repo
Branches
Core operations
Local
Repo
History
Remote
Repo
Branches

9. GitLab
 Opensource Git server like GitHub
 Activity Stream
 File browser
 Integrated wiki
 Powerful Code review workflow
 Issue Management
 Code snippets
 Web hooks (For CI integrations)

10. Dashboard
http://gitlabrepo/
Host Entry
192.168.150.76 gitlabrepo
WCS7-FEP7
project
QAS
Module
(Git Module)

11. Acivity Stream

12. File Browser

13. Integrated Wiki

14. Merge Requests & Code Review
 Merge requests from
branches which are cloned
 Eg:- Merge request to
Template branch from
Development team on a
security issue fix
 Discuss merge requests. Side
by side diff is available for
review
 Suggest/Accept/Reject
changes
 Once click merge is
available from frontend itself
if branch is fast-forward
 Emails on merge requests
and up on completions

15. Issues
 Release requirements
can be an issue
 Discussion threads
 Designs can be
discussed over
comments
 Milestones can be
added

16. Snippets

17. Typical Workflow
 Clone Project
 Create branch with your feature
 Write code, Commit changes
 Push branch to GitLab
 Review code on commit page
 Create a merge request
 Your team lead will review the code & merge it to the main branch