SlideShare ist ein Scribd-Unternehmen logo

Git workflows

•
•
Xpand IT
Xpand IT
1 von 13
Git Workflows RUI RODRIGUES • ATLASSIAN EXPERT • XPAND IT • @RODRIGUESRMB
Git Workflows are simply guidelines and not a set of strict rules.
Feature Branch Workflow Git Workflows Gitflow Workflow Forking Workflow Basic/Centralized Workflow
Basic/ Centralized Workflow The most basic Git Workflow • Something like SVN workflow • Advantages over SVN: • Local copy of entire project • Branching and merging model • All changes are committed into master branch (SVN trunk equivalent)
Basic/Centralized Workflow Git Workflows Gitflow Workflow Forking Workflow Feature Branch Workflow
Feature Branch Workflow Branch by feature • Master branch represents the code base (final solution) • Each developer works on its own feature • This workflow avoid broken code • Share feature with other developer without change master branch • Code Review is the major advantage of using pull requests • Join feature into master branch • Discuss changes between developers
Feature Branch Workflow Git Workflows Basic/Centralized Workflow Forking Workflow Gitflow Workflow
Gitflow Workflow Gitflow • Proposes • Managing feature development • Release preparation • Maintenance • More complex than Feature Branch Workflow • Main branches: • master – stores the official release history • develop – serves as an integration branch for features • Feature branches • Each feature branch should reside on its branch • The feature branch isn’t merged into master directly, it should be merged on develop branch
Gitflow Workflow Gitflow • Release Branches • When develop branch has enough features for a release it’s time to create a new branch from develop – Release Branch • This action starts a new release cycle • New feature can’t be added • Only can be added bug fixes, documentation and tasks related with the release process • When the release is ready to deliver, the release branch should be merged into master and develop and a new tag should be created.
Gitflow Workflow Gitflow • Maintenance Branches • Also known as a hotfix branch • Unique branch that should be created from master branch • When the fix is complete, the branch should be merged into master and develop or the current release branch • Master branch should be tagged with the current version
Feature Branch Workflow Git Wokflows Gitflow Workflow Basic/Centralized Workflow Forking Workflow
Forking Workflow Forking Workflow • It’s different from other workflows already presented here • There is no central repository • Each developer has a server-side repository (public) and a local repository (private) • Developers push to their own server-side repositories • Only the project maintainer can push to the official repository • In this way, project maintainer accept commits from any developer without giving them access to the official codebase • Bitbucket and Github are examples of using this workflow.
Thank you! RUI RODRIGUES • ATLASSIAN EXPERT • XPAND IT • @RODRIGUESRMB

Empfohlen

Git workflows presentation
Git workflows presentationGit workflows presentation
Git workflows presentationMack Hardy
 
Git Series. Episode 3. Git Flow and Github-Flow
Git Series. Episode 3. Git Flow and Github-FlowGit Series. Episode 3. Git Flow and Github-Flow
Git Series. Episode 3. Git Flow and Github-FlowMikhail Melnik
 
A successful Git branching model
A successful Git branching model A successful Git branching model
A successful Git branching model abodeltae
 
Git and GitFlow branching model
Git and GitFlow branching modelGit and GitFlow branching model
Git and GitFlow branching modelPavlo Hodysh
 
Git flow
Git flowGit flow
Git flowValerio Como
 
Git Branching Model
Git Branching ModelGit Branching Model
Git Branching ModelLemi Orhan Ergin
 
Introduction to git flow
Introduction to git flowIntroduction to git flow
Introduction to git flowKnoldus Inc.
 
Git flow Introduction
Git flow IntroductionGit flow Introduction
Git flow IntroductionDavid Paluy
 

Empfohlen

Git workflows presentation
Git workflows presentationGit workflows presentation
Git workflows presentationMack Hardy
 
Git Series. Episode 3. Git Flow and Github-Flow
Git Series. Episode 3. Git Flow and Github-FlowGit Series. Episode 3. Git Flow and Github-Flow
Git Series. Episode 3. Git Flow and Github-FlowMikhail Melnik
 
A successful Git branching model
A successful Git branching model A successful Git branching model
A successful Git branching model abodeltae
 
Git and GitFlow branching model
Git and GitFlow branching modelGit and GitFlow branching model
Git and GitFlow branching modelPavlo Hodysh
 
Git flow
Git flowGit flow
Git flowValerio Como
 
Git Branching Model
Git Branching ModelGit Branching Model
Git Branching ModelLemi Orhan Ergin
 
Introduction to git flow
Introduction to git flowIntroduction to git flow
Introduction to git flowKnoldus Inc.
 
Git flow Introduction
Git flow IntroductionGit flow Introduction
Git flow IntroductionDavid Paluy
 
Git - Basic Crash Course
Git - Basic Crash CourseGit - Basic Crash Course
Git - Basic Crash CourseNilay Binjola
 
Git training v10
Git training v10Git training v10
Git training v10Skander Hamza
 
Git basic
Git basicGit basic
Git basicEmran Ul Hadi
 
A Git Workflow Model or Branching Strategy
A Git Workflow Model or Branching StrategyA Git Workflow Model or Branching Strategy
A Git Workflow Model or Branching StrategyVivek Parihar
 
Github - Git Training Slides: Foundations
Github - Git Training Slides: FoundationsGithub - Git Training Slides: Foundations
Github - Git Training Slides: FoundationsLee Hanxue
 
Git and github 101
Git and github 101Git and github 101
Git and github 101Senthilkumar Gopal
 
Introduction to Git
Introduction to GitIntroduction to Git
Introduction to GitLukas Fittl
 
Git branching strategies
Git branching strategiesGit branching strategies
Git branching strategiesjstack
 
Git and git workflow best practice
Git and git workflow best practiceGit and git workflow best practice
Git and git workflow best practiceMajid Hosseini
 
Git basics
Git basicsGit basics
Git basicsGHARSALLAH Mohamed
 
Git
GitGit
GitShinu Suresh
 
Git-flow workflow and pull-requests
Git-flow workflow and pull-requestsGit-flow workflow and pull-requests
Git-flow workflow and pull-requestsBartosz Kosarzycki
 
Advanced Git Tutorial
Advanced Git TutorialAdvanced Git Tutorial
Advanced Git TutorialSage Sharp
 
Introduction git
Introduction gitIntroduction git
Introduction gitDian Sigit Prastowo
 
Git 101 for Beginners
Git 101 for Beginners Git 101 for Beginners
Git 101 for Beginners Anurag Upadhaya
 
Intro to git and git hub
Intro to git and git hubIntro to git and git hub
Intro to git and git hubVenkat Malladi
 
Git workflows
Git workflowsGit workflows
Git workflowsSergiu Savva
 
Introduction To Git
Introduction To GitIntroduction To Git
Introduction To GitArnaud Seilles
 
Basic Git Intro
Basic Git IntroBasic Git Intro
Basic Git IntroYoad Snapir
 
Git flow for daily use
Git flow for daily useGit flow for daily use
Git flow for daily useMediacurrent
 
Git workflows
Git workflowsGit workflows
Git workflowsThuc Le Dong
 
Git Ready! Workflows
Git Ready! WorkflowsGit Ready! Workflows
Git Ready! WorkflowsAtlassian
 

Weitere ähnliche Inhalte

Was ist angesagt?

Git - Basic Crash Course
Git - Basic Crash CourseGit - Basic Crash Course
Git - Basic Crash CourseNilay Binjola
 
A Git Workflow Model or Branching Strategy
A Git Workflow Model or Branching StrategyA Git Workflow Model or Branching Strategy
A Git Workflow Model or Branching StrategyVivek Parihar
 
Github - Git Training Slides: Foundations
Github - Git Training Slides: FoundationsGithub - Git Training Slides: Foundations
Github - Git Training Slides: FoundationsLee Hanxue
 
Introduction to Git
Introduction to GitIntroduction to Git
Introduction to GitLukas Fittl
 
Git branching strategies
Git branching strategiesGit branching strategies
Git branching strategiesjstack
 
Git and git workflow best practice
Git and git workflow best practiceGit and git workflow best practice
Git and git workflow best practiceMajid Hosseini
 
Git-flow workflow and pull-requests
Git-flow workflow and pull-requestsGit-flow workflow and pull-requests
Git-flow workflow and pull-requestsBartosz Kosarzycki
 
Advanced Git Tutorial
Advanced Git TutorialAdvanced Git Tutorial
Advanced Git TutorialSage Sharp
 
Intro to git and git hub
Intro to git and git hubIntro to git and git hub
Intro to git and git hubVenkat Malladi
 
Git flow for daily use
Git flow for daily useGit flow for daily use
Git flow for daily useMediacurrent
 

Was ist angesagt? (20)

Git - Basic Crash Course
Git - Basic Crash CourseGit - Basic Crash Course
Git - Basic Crash Course
 
Git training v10
Git training v10Git training v10
Git training v10
 
Git basic
Git basicGit basic
Git basic
 
A Git Workflow Model or Branching Strategy
A Git Workflow Model or Branching StrategyA Git Workflow Model or Branching Strategy
A Git Workflow Model or Branching Strategy
 
Github - Git Training Slides: Foundations
Github - Git Training Slides: FoundationsGithub - Git Training Slides: Foundations
Github - Git Training Slides: Foundations
 
Git and github 101
Git and github 101Git and github 101
Git and github 101
 
Introduction to Git
Introduction to GitIntroduction to Git
Introduction to Git
 
Git branching strategies
Git branching strategiesGit branching strategies
Git branching strategies
 
Git and git workflow best practice
Git and git workflow best practiceGit and git workflow best practice
Git and git workflow best practice
 
Git basics
Git basicsGit basics
Git basics
 
Git
GitGit
Git
 
Git-flow workflow and pull-requests
Git-flow workflow and pull-requestsGit-flow workflow and pull-requests
Git-flow workflow and pull-requests
 
Advanced Git Tutorial
Advanced Git TutorialAdvanced Git Tutorial
Advanced Git Tutorial
 
Introduction git
Introduction gitIntroduction git
Introduction git
 
Git 101 for Beginners
Git 101 for Beginners Git 101 for Beginners
Git 101 for Beginners
 
Intro to git and git hub
Intro to git and git hubIntro to git and git hub
Intro to git and git hub
 
Git workflows
Git workflowsGit workflows
Git workflows
 
Introduction To Git
Introduction To GitIntroduction To Git
Introduction To Git
 
Basic Git Intro
Basic Git IntroBasic Git Intro
Basic Git Intro
 
Git flow for daily use
Git flow for daily useGit flow for daily use
Git flow for daily use
 

Andere mochten auch

Git Ready! Workflows
Git Ready! WorkflowsGit Ready! Workflows
Git Ready! WorkflowsAtlassian
 
Unconstrained Analytics in the Age of Data – Delivering High-Performance Anal...
Unconstrained Analytics in the Age of Data – Delivering High-Performance Anal...Unconstrained Analytics in the Age of Data – Delivering High-Performance Anal...
Unconstrained Analytics in the Age of Data – Delivering High-Performance Anal...Xpand IT
 
i2 s | Insurance Knowledge
i2 s | Insurance Knowledgei2 s | Insurance Knowledge
i2 s | Insurance KnowledgeXpand IT
 
Xamarin Experience London: Welcome
Xamarin Experience London: WelcomeXamarin Experience London: Welcome
Xamarin Experience London: WelcomeXpand IT
 
Sparkl: End to End integration with Pentaho
Sparkl: End to End integration with PentahoSparkl: End to End integration with Pentaho
Sparkl: End to End integration with PentahoXpand IT
 
Cloudera Customer Success Story
Cloudera Customer Success StoryCloudera Customer Success Story
Cloudera Customer Success StoryXpand IT
 
Xamarin Experience London: CA Mobile Banking with Xamarin
Xamarin Experience London: CA Mobile Banking with XamarinXamarin Experience London: CA Mobile Banking with Xamarin
Xamarin Experience London: CA Mobile Banking with XamarinXpand IT
 
Deliver Fast and Reliably with Dev Ops and Atlassian
Deliver Fast and Reliably with Dev Ops and AtlassianDeliver Fast and Reliably with Dev Ops and Atlassian
Deliver Fast and Reliably with Dev Ops and AtlassianXpand IT
 
Customer Sucess Story: Big Data in EDP
Customer Sucess Story: Big Data in EDP Customer Sucess Story: Big Data in EDP
Customer Sucess Story: Big Data in EDP Xpand IT
 
Why Aren't You Using Git Flow?
Why Aren't You Using Git Flow?Why Aren't You Using Git Flow?
Why Aren't You Using Git Flow?John Congdon
 
Introduction to Cloudera's Unique Architecture & Competitive Advantages
Introduction to Cloudera's Unique Architecture & Competitive AdvantagesIntroduction to Cloudera's Unique Architecture & Competitive Advantages
Introduction to Cloudera's Unique Architecture & Competitive AdvantagesXpand IT
 
git flowを使った開発フロー
git flowを使った開発フローgit flowを使った開発フロー
git flowを使った開発フローshigetoshi komatsu
 
Git flow概要紹介
Git flow概要紹介Git flow概要紹介
Git flow概要紹介y42sora
 
Introduction to git administration
Introduction to git administrationIntroduction to git administration
Introduction to git administrationShawn Doyle
 
Powerapps & Flow
Powerapps & FlowPowerapps & Flow
Powerapps & FlowXpand IT
 
Extend your Confluence and Jira Functionalities
Extend your Confluence and Jira FunctionalitiesExtend your Confluence and Jira Functionalities
Extend your Confluence and Jira FunctionalitiesXpand IT
 

Andere mochten auch (20)

Git workflows
Git workflowsGit workflows
Git workflows
 
Git Ready! Workflows
Git Ready! WorkflowsGit Ready! Workflows
Git Ready! Workflows
 
git flow
git flowgit flow
git flow
 
Unconstrained Analytics in the Age of Data – Delivering High-Performance Anal...
Unconstrained Analytics in the Age of Data – Delivering High-Performance Anal...Unconstrained Analytics in the Age of Data – Delivering High-Performance Anal...
Unconstrained Analytics in the Age of Data – Delivering High-Performance Anal...
 
i2 s | Insurance Knowledge
i2 s | Insurance Knowledgei2 s | Insurance Knowledge
i2 s | Insurance Knowledge
 
Xamarin Experience London: Welcome
Xamarin Experience London: WelcomeXamarin Experience London: Welcome
Xamarin Experience London: Welcome
 
Sparkl: End to End integration with Pentaho
Sparkl: End to End integration with PentahoSparkl: End to End integration with Pentaho
Sparkl: End to End integration with Pentaho
 
Cloudera Customer Success Story
Cloudera Customer Success StoryCloudera Customer Success Story
Cloudera Customer Success Story
 
Xamarin Experience London: CA Mobile Banking with Xamarin
Xamarin Experience London: CA Mobile Banking with XamarinXamarin Experience London: CA Mobile Banking with Xamarin
Xamarin Experience London: CA Mobile Banking with Xamarin
 
Deliver Fast and Reliably with Dev Ops and Atlassian
Deliver Fast and Reliably with Dev Ops and AtlassianDeliver Fast and Reliably with Dev Ops and Atlassian
Deliver Fast and Reliably with Dev Ops and Atlassian
 
Customer Sucess Story: Big Data in EDP
Customer Sucess Story: Big Data in EDP Customer Sucess Story: Big Data in EDP
Customer Sucess Story: Big Data in EDP
 
Enterprise Git
Enterprise GitEnterprise Git
Enterprise Git
 
My Git workflow
My Git workflowMy Git workflow
My Git workflow
 
Why Aren't You Using Git Flow?
Why Aren't You Using Git Flow?Why Aren't You Using Git Flow?
Why Aren't You Using Git Flow?
 
Introduction to Cloudera's Unique Architecture & Competitive Advantages
Introduction to Cloudera's Unique Architecture & Competitive AdvantagesIntroduction to Cloudera's Unique Architecture & Competitive Advantages
Introduction to Cloudera's Unique Architecture & Competitive Advantages
 
git flowを使った開発フロー
git flowを使った開発フローgit flowを使った開発フロー
git flowを使った開発フロー
 
Git flow概要紹介
Git flow概要紹介Git flow概要紹介
Git flow概要紹介
 
Introduction to git administration
Introduction to git administrationIntroduction to git administration
Introduction to git administration
 
Powerapps & Flow
Powerapps & FlowPowerapps & Flow
Powerapps & Flow
 
Extend your Confluence and Jira Functionalities
Extend your Confluence and Jira FunctionalitiesExtend your Confluence and Jira Functionalities
Extend your Confluence and Jira Functionalities
 

Ähnlich wie Git workflows

Git Workflows
Git WorkflowsGit Workflows
Git WorkflowsNoam Kfir
 
Git Going w/ Git
Git Going w/ GitGit Going w/ Git
Git Going w/ GitheyMP
 
Git version control and trunk based approach with VSTS
Git version control and trunk based approach with VSTSGit version control and trunk based approach with VSTS
Git version control and trunk based approach with VSTSMurughan Palaniachari
 
SQL Server DevOps Jumpstart
SQL Server DevOps JumpstartSQL Server DevOps Jumpstart
SQL Server DevOps JumpstartOri Donner
 
Workshop on Git, GitHub & Web Hosting
Workshop on Git, GitHub & Web HostingWorkshop on Git, GitHub & Web Hosting
Workshop on Git, GitHub & Web HostingGDSCNKOCET
 
Tool Development A - Git
Tool Development A - GitTool Development A - Git
Tool Development A - GitNick Pruehs
 
How We Use GitHub
How We Use GitHubHow We Use GitHub
How We Use GitHubNYC DevShop
 
An introduction to Git and GitFlow
An introduction to Git and GitFlowAn introduction to Git and GitFlow
An introduction to Git and GitFlowMark Everard
 
Introduction to github slideshare
Introduction to github slideshareIntroduction to github slideshare
Introduction to github slideshareRakesh Sukumar
 
Collaborative development with git
Collaborative development with gitCollaborative development with git
Collaborative development with gitJoseluis Laso
 
Git Workflow
Git WorkflowGit Workflow
Git WorkflowGary Yeh
 
How to use Git Branch
How to use Git BranchHow to use Git Branch
How to use Git BranchPhuoc Nguyen
 

Ähnlich wie Git workflows (20)

git Technologies
git Technologiesgit Technologies
git Technologies
 
Git Workflows
Git WorkflowsGit Workflows
Git Workflows
 
Git Going w/ Git
Git Going w/ GitGit Going w/ Git
Git Going w/ Git
 
Git collaboration
Git collaborationGit collaboration
Git collaboration
 
GIT In Detail
GIT In DetailGIT In Detail
GIT In Detail
 
Git at an Enterprise
Git at an EnterpriseGit at an Enterprise
Git at an Enterprise
 
Git version control and trunk based approach with VSTS
Git version control and trunk based approach with VSTSGit version control and trunk based approach with VSTS
Git version control and trunk based approach with VSTS
 
SQL Server DevOps Jumpstart
SQL Server DevOps JumpstartSQL Server DevOps Jumpstart
SQL Server DevOps Jumpstart
 
Workshop on Git, GitHub & Web Hosting
Workshop on Git, GitHub & Web HostingWorkshop on Git, GitHub & Web Hosting
Workshop on Git, GitHub & Web Hosting
 
Tool Development A - Git
Tool Development A - GitTool Development A - Git
Tool Development A - Git
 
How We Use GitHub
How We Use GitHubHow We Use GitHub
How We Use GitHub
 
An introduction to Git and GitFlow
An introduction to Git and GitFlowAn introduction to Git and GitFlow
An introduction to Git and GitFlow
 
Flow
FlowFlow
Flow
 
Introduction to github slideshare
Introduction to github slideshareIntroduction to github slideshare
Introduction to github slideshare
 
Collaborative development with git
Collaborative development with gitCollaborative development with git
Collaborative development with git
 
Introduction to git
Introduction to gitIntroduction to git
Introduction to git
 
Introduction to Git
Introduction to GitIntroduction to Git
Introduction to Git
 
Git Workflow
Git WorkflowGit Workflow
Git Workflow
 
Working with Git
Working with GitWorking with Git
Working with Git
 
How to use Git Branch
How to use Git BranchHow to use Git Branch
How to use Git Branch
 

Mehr von Xpand IT

Xray & Xporter were in Austria: Jira & Confluence Solutions Day 2018
Xray & Xporter were in Austria: Jira & Confluence Solutions Day 2018Xray & Xporter were in Austria: Jira & Confluence Solutions Day 2018
Xray & Xporter were in Austria: Jira & Confluence Solutions Day 2018Xpand IT
 
Using Xamarin for your Mobile+ Apps – Xamarin Experience London 2017
Using Xamarin for your Mobile+ Apps – Xamarin Experience London 2017Using Xamarin for your Mobile+ Apps – Xamarin Experience London 2017
Using Xamarin for your Mobile+ Apps – Xamarin Experience London 2017Xpand IT
 
Xporter for Jira - Overview
Xporter for Jira - OverviewXporter for Jira - Overview
Xporter for Jira - OverviewXpand IT
 
Xray for Jira - How to automate your QA process
Xray for Jira - How to automate your QA processXray for Jira - How to automate your QA process
Xray for Jira - How to automate your QA processXpand IT
 
Xpand Addons - Addon Discovery Day 2017
Xpand Addons - Addon Discovery Day 2017Xpand Addons - Addon Discovery Day 2017
Xpand Addons - Addon Discovery Day 2017Xpand IT
 
Xray for Jira 3.0 - What's New?
Xray for Jira 3.0 - What's New?Xray for Jira 3.0 - What's New?
Xray for Jira 3.0 - What's New?Xpand IT
 
Xray for Jira - Overview
Xray for Jira - OverviewXray for Jira - Overview
Xray for Jira - OverviewXpand IT
 
Xporter for Jira - Advanced topics
Xporter for Jira - Advanced topicsXporter for Jira - Advanced topics
Xporter for Jira - Advanced topicsXpand IT
 
Keynote - Xamarin Experience London 2017
Keynote - Xamarin Experience London 2017 Keynote - Xamarin Experience London 2017
Keynote - Xamarin Experience London 2017 Xpand IT
 
Welcome & Introduction – Xamarin Experience London 2017
Welcome & Introduction – Xamarin Experience London 2017 Welcome & Introduction – Xamarin Experience London 2017
Welcome & Introduction – Xamarin Experience London 2017 Xpand IT
 
Gathering Customer Insights with Sitecore - Xamarin Experience London 2017
Gathering Customer Insights with Sitecore - Xamarin Experience London 2017Gathering Customer Insights with Sitecore - Xamarin Experience London 2017
Gathering Customer Insights with Sitecore - Xamarin Experience London 2017Xpand IT
 
Why Speed Matters in Mobile Apps – Xamarin Experience London 2017
Why Speed Matters in Mobile Apps – Xamarin Experience London 2017Why Speed Matters in Mobile Apps – Xamarin Experience London 2017
Why Speed Matters in Mobile Apps – Xamarin Experience London 2017Xpand IT
 
Mobile & Cognitive Services | Harnessing the Power of IoT – Xamarin Experienc...
Mobile & Cognitive Services | Harnessing the Power of IoT – Xamarin Experienc...Mobile & Cognitive Services | Harnessing the Power of IoT – Xamarin Experienc...
Mobile & Cognitive Services | Harnessing the Power of IoT – Xamarin Experienc...Xpand IT
 
Atlassian Tools in Practice: A Customer Success Story – Xpand IT & Atlassian ...
Atlassian Tools in Practice: A Customer Success Story – Xpand IT & Atlassian ...Atlassian Tools in Practice: A Customer Success Story – Xpand IT & Atlassian ...
Atlassian Tools in Practice: A Customer Success Story – Xpand IT & Atlassian ...Xpand IT
 
The Secret Sauce of Successful Teams - Xpand IT & Atlassian JAM Sessions 2017
The Secret Sauce of Successful Teams - Xpand IT & Atlassian JAM Sessions 2017The Secret Sauce of Successful Teams - Xpand IT & Atlassian JAM Sessions 2017
The Secret Sauce of Successful Teams - Xpand IT & Atlassian JAM Sessions 2017Xpand IT
 
Quality Assurance Made Easy in JIRA - Xpand IT & Atlassian JAM Sessions 2017
Quality Assurance Made Easy in JIRA - Xpand IT & Atlassian JAM Sessions 2017Quality Assurance Made Easy in JIRA - Xpand IT & Atlassian JAM Sessions 2017
Quality Assurance Made Easy in JIRA - Xpand IT & Atlassian JAM Sessions 2017Xpand IT
 
Improved Reporting with JIRA Add-ons - Xpand IT & Atlassian JAM Sessions 2017
Improved Reporting with JIRA Add-ons - Xpand IT & Atlassian JAM Sessions 2017Improved Reporting with JIRA Add-ons - Xpand IT & Atlassian JAM Sessions 2017
Improved Reporting with JIRA Add-ons - Xpand IT & Atlassian JAM Sessions 2017Xpand IT
 
How our Team Collaborates with Atlassian Tools - Xpand IT & Atlassian JAM Ses...
How our Team Collaborates with Atlassian Tools - Xpand IT & Atlassian JAM Ses...How our Team Collaborates with Atlassian Tools - Xpand IT & Atlassian JAM Ses...
How our Team Collaborates with Atlassian Tools - Xpand IT & Atlassian JAM Ses...Xpand IT
 
Welcome & Introduction - Xpand IT & Atlassian JAM Sessions 2017
Welcome & Introduction - Xpand IT & Atlassian JAM Sessions 2017 Welcome & Introduction - Xpand IT & Atlassian JAM Sessions 2017
Welcome & Introduction - Xpand IT & Atlassian JAM Sessions 2017 Xpand IT
 
The Real World with OpenShift - Red Hat DevOps & Microservices Conference 2017
The Real World with OpenShift - Red Hat DevOps & Microservices Conference 2017 The Real World with OpenShift - Red Hat DevOps & Microservices Conference 2017
The Real World with OpenShift - Red Hat DevOps & Microservices Conference 2017 Xpand IT
 

Mehr von Xpand IT (20)

Xray & Xporter were in Austria: Jira & Confluence Solutions Day 2018
Xray & Xporter were in Austria: Jira & Confluence Solutions Day 2018Xray & Xporter were in Austria: Jira & Confluence Solutions Day 2018
Xray & Xporter were in Austria: Jira & Confluence Solutions Day 2018
 
Using Xamarin for your Mobile+ Apps – Xamarin Experience London 2017
Using Xamarin for your Mobile+ Apps – Xamarin Experience London 2017Using Xamarin for your Mobile+ Apps – Xamarin Experience London 2017
Using Xamarin for your Mobile+ Apps – Xamarin Experience London 2017
 
Xporter for Jira - Overview
Xporter for Jira - OverviewXporter for Jira - Overview
Xporter for Jira - Overview
 
Xray for Jira - How to automate your QA process
Xray for Jira - How to automate your QA processXray for Jira - How to automate your QA process
Xray for Jira - How to automate your QA process
 
Xpand Addons - Addon Discovery Day 2017
Xpand Addons - Addon Discovery Day 2017Xpand Addons - Addon Discovery Day 2017
Xpand Addons - Addon Discovery Day 2017
 
Xray for Jira 3.0 - What's New?
Xray for Jira 3.0 - What's New?Xray for Jira 3.0 - What's New?
Xray for Jira 3.0 - What's New?
 
Xray for Jira - Overview
Xray for Jira - OverviewXray for Jira - Overview
Xray for Jira - Overview
 
Xporter for Jira - Advanced topics
Xporter for Jira - Advanced topicsXporter for Jira - Advanced topics
Xporter for Jira - Advanced topics
 
Keynote - Xamarin Experience London 2017
Keynote - Xamarin Experience London 2017 Keynote - Xamarin Experience London 2017
Keynote - Xamarin Experience London 2017
 
Welcome & Introduction – Xamarin Experience London 2017
Welcome & Introduction – Xamarin Experience London 2017 Welcome & Introduction – Xamarin Experience London 2017
Welcome & Introduction – Xamarin Experience London 2017
 
Gathering Customer Insights with Sitecore - Xamarin Experience London 2017
Gathering Customer Insights with Sitecore - Xamarin Experience London 2017Gathering Customer Insights with Sitecore - Xamarin Experience London 2017
Gathering Customer Insights with Sitecore - Xamarin Experience London 2017
 
Why Speed Matters in Mobile Apps – Xamarin Experience London 2017
Why Speed Matters in Mobile Apps – Xamarin Experience London 2017Why Speed Matters in Mobile Apps – Xamarin Experience London 2017
Why Speed Matters in Mobile Apps – Xamarin Experience London 2017
 
Mobile & Cognitive Services | Harnessing the Power of IoT – Xamarin Experienc...
Mobile & Cognitive Services | Harnessing the Power of IoT – Xamarin Experienc...Mobile & Cognitive Services | Harnessing the Power of IoT – Xamarin Experienc...
Mobile & Cognitive Services | Harnessing the Power of IoT – Xamarin Experienc...
 
Atlassian Tools in Practice: A Customer Success Story – Xpand IT & Atlassian ...
Atlassian Tools in Practice: A Customer Success Story – Xpand IT & Atlassian ...Atlassian Tools in Practice: A Customer Success Story – Xpand IT & Atlassian ...
Atlassian Tools in Practice: A Customer Success Story – Xpand IT & Atlassian ...
 
The Secret Sauce of Successful Teams - Xpand IT & Atlassian JAM Sessions 2017
The Secret Sauce of Successful Teams - Xpand IT & Atlassian JAM Sessions 2017The Secret Sauce of Successful Teams - Xpand IT & Atlassian JAM Sessions 2017
The Secret Sauce of Successful Teams - Xpand IT & Atlassian JAM Sessions 2017
 
Quality Assurance Made Easy in JIRA - Xpand IT & Atlassian JAM Sessions 2017
Quality Assurance Made Easy in JIRA - Xpand IT & Atlassian JAM Sessions 2017Quality Assurance Made Easy in JIRA - Xpand IT & Atlassian JAM Sessions 2017
Quality Assurance Made Easy in JIRA - Xpand IT & Atlassian JAM Sessions 2017
 
Improved Reporting with JIRA Add-ons - Xpand IT & Atlassian JAM Sessions 2017
Improved Reporting with JIRA Add-ons - Xpand IT & Atlassian JAM Sessions 2017Improved Reporting with JIRA Add-ons - Xpand IT & Atlassian JAM Sessions 2017
Improved Reporting with JIRA Add-ons - Xpand IT & Atlassian JAM Sessions 2017
 
How our Team Collaborates with Atlassian Tools - Xpand IT & Atlassian JAM Ses...
How our Team Collaborates with Atlassian Tools - Xpand IT & Atlassian JAM Ses...How our Team Collaborates with Atlassian Tools - Xpand IT & Atlassian JAM Ses...
How our Team Collaborates with Atlassian Tools - Xpand IT & Atlassian JAM Ses...
 
Welcome & Introduction - Xpand IT & Atlassian JAM Sessions 2017
Welcome & Introduction - Xpand IT & Atlassian JAM Sessions 2017 Welcome & Introduction - Xpand IT & Atlassian JAM Sessions 2017
Welcome & Introduction - Xpand IT & Atlassian JAM Sessions 2017
 
The Real World with OpenShift - Red Hat DevOps & Microservices Conference 2017
The Real World with OpenShift - Red Hat DevOps & Microservices Conference 2017 The Real World with OpenShift - Red Hat DevOps & Microservices Conference 2017
The Real World with OpenShift - Red Hat DevOps & Microservices Conference 2017
 

Git workflows

  • 1. Git Workflows RUI RODRIGUES • ATLASSIAN EXPERT • XPAND IT • @RODRIGUESRMB
  • 2. Git Workflows are simply guidelines and not a set of strict rules.
  • 3. Feature Branch Workflow Git Workflows Gitflow Workflow Forking Workflow Basic/Centralized Workflow
  • 4. Basic/ Centralized Workflow The most basic Git Workflow • Something like SVN workflow • Advantages over SVN: • Local copy of entire project • Branching and merging model • All changes are committed into master branch (SVN trunk equivalent)
  • 5. Basic/Centralized Workflow Git Workflows Gitflow Workflow Forking Workflow Feature Branch Workflow
  • 6. Feature Branch Workflow Branch by feature • Master branch represents the code base (final solution) • Each developer works on its own feature • This workflow avoid broken code • Share feature with other developer without change master branch • Code Review is the major advantage of using pull requests • Join feature into master branch • Discuss changes between developers
  • 7. Feature Branch Workflow Git Workflows Basic/Centralized Workflow Forking Workflow Gitflow Workflow
  • 8. Gitflow Workflow Gitflow • Proposes • Managing feature development • Release preparation • Maintenance • More complex than Feature Branch Workflow • Main branches: • master – stores the official release history • develop – serves as an integration branch for features • Feature branches • Each feature branch should reside on its branch • The feature branch isn’t merged into master directly, it should be merged on develop branch
  • 9. Gitflow Workflow Gitflow • Release Branches • When develop branch has enough features for a release it’s time to create a new branch from develop – Release Branch • This action starts a new release cycle • New feature can’t be added • Only can be added bug fixes, documentation and tasks related with the release process • When the release is ready to deliver, the release branch should be merged into master and develop and a new tag should be created.
  • 10. Gitflow Workflow Gitflow • Maintenance Branches • Also known as a hotfix branch • Unique branch that should be created from master branch • When the fix is complete, the branch should be merged into master and develop or the current release branch • Master branch should be tagged with the current version
  • 11. Feature Branch Workflow Git Wokflows Gitflow Workflow Basic/Centralized Workflow Forking Workflow
  • 12. Forking Workflow Forking Workflow • It’s different from other workflows already presented here • There is no central repository • Each developer has a server-side repository (public) and a local repository (private) • Developers push to their own server-side repositories • Only the project maintainer can push to the official repository • In this way, project maintainer accept commits from any developer without giving them access to the official codebase • Bitbucket and Github are examples of using this workflow.
  • 13. Thank you! RUI RODRIGUES • ATLASSIAN EXPERT • XPAND IT • @RODRIGUESRMB