gitflow, sourcetree and gitlab

Download GitFlow, SourceTree and GitLab

Post on 15-Jul-2015

903 views

Category:

Technology

10 download

Embed Size (px)

TRANSCRIPT

GitFlow

GitFlowSourceTreeGitLabShinu Suresh

QADevelopment BranchesProductionMain BranchesDevelopmaster

Supporting branchesFeature

Release

Hotfix

Branch namingFeature Anything except master, develop, release-*, hotfix-*Eg:- Qas, Autosuggest, ScrollableProducts etcRelease Release-*Eg:- Release-v1.0.0 (Follow semver), Release-Woody, Release-CheckoutV2 etcFor more information on semver - http://semver.org/Hotfix Hotfix-*Eg:- Hotfix-v1.0.0-PLPIssue, Hotfix-1.0-JIRA-1928 etcTag Eg:- Tag-v1.0.0 (Following semver), Tag-Woody etcSourceTree

Atlassian ProductPerfect for NewbiesGitFlow integration

Configuration

Git User Name Git EmailGit Private Key

Public key To be copied over to gitlabSourceTree Dashboard

Your Cloned ReposLocal Repo BranchesCore operationsLocal Repo HistoryRemote Repo BranchesGitLabOpensource Git server like GitHubActivity StreamFile browserIntegrated wikiPowerful Code review workflowIssue ManagementCode snippetsWeb hooks (For CI integrations)

Dashboard

http://gitlabrepo/

Host Entry192.168.150.76gitlabrepo

WCS7-FEP7 projectQAS Module (Git Module)Acivity Stream

File Browser

Integrated Wiki

Merge Requests & Code ReviewMerge requests from branches which are clonedEg:- Merge request to Template branch from Development team on a security issue fixDiscuss merge requests. Side by side diff is available for reviewSuggest/Accept/Reject changesOnce click merge is available from frontend itself if branch is fast-forwardEmails on merge requests and up on completions

IssuesRelease requirements can be an issueDiscussion threadsDesigns can be discussed over commentsMilestones can be added

Snippets

Typical WorkflowClone ProjectCreate branch with your featureWrite code, Commit changesPush branch to GitLabReview code on commit pageCreate a merge requestYour team lead will review the code & merge it to the main branch