• Like
  • Save
Branch to branch by Photis Patriotis
Upcoming SlideShare
Loading in...5
×
 

Branch to branch by Photis Patriotis

on

  • 218 views

Making GIT Workflows Work - Branch to branch by Photis Patriotis

Making GIT Workflows Work - Branch to branch by Photis Patriotis

Statistics

Views

Total Views
218
Views on SlideShare
218
Embed Views
0

Actions

Likes
0
Downloads
2
Comments
0

0 Embeds 0

No embeds

Accessibility

Upload Details

Uploaded via as Adobe PDF

Usage Rights

© All Rights Reserved

Report content

Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
  • Full Name Full Name Comment goes here.
    Are you sure you want to
    Your message goes here
    Processing…
Post Comment
Edit your comment

    Branch to branch by Photis Patriotis Branch to branch by Photis Patriotis Presentation Transcript

    • Branch to Branch Making GIT Workflows Work
    • Assumptions ● You’ve used GIT ● You’ve branched something ● You’ve merged something ● You’ve tagged something ● You’ve messed something up pretty badly
    • What is a branch?
    • Why is GIT Workflow Important ● Communicate Releases ● Testing (Manual and Automated) ● Code reviews ● Hot Fixes ● Semantic Versioning ● Work as both a team and individuals
    • Base Branches /develop /master
    • Feature Branches Pull Request /develop /feature/descriptive-name /master
    • Tags / Versioning v1.0.0 v1.1.0 /develop /master Testing
    • Hot Fix Pull Request /develop /master /hot-fix/descriptive-name v1.3.0 v1.3.1
    • Release/Staging Branch v2.0.0v1.3.0 /develop /master /release/v2.0.xTesting
    • Advanced Flows
    • Large Features / Epics Pull Request + Code Walkthrough Pull Request /epic/descriptive-name/develop /develop /master /epic/descriptive-name/sub-feature
    • Multiple Concentrations /android/develop /android/master /ios/develop /ios/master /server/develop /server/master /master server-v1.0.0 ios-v2.7.0 android-v3.3.0 android-v3.4.0 ios-v3.0.0 server-v1.1.0
    • Forking Repos ● Organic ● Role Based ● Many Implementations
    • Branch Permissions
    • Resources ● gitflow ○ http://nvie.com/posts/a-successful-git-branching-model/ ○ http://danielkummer.github.io/git-flow-cheatsheet/ ● Distributed Workflows ○ http://git-scm.com/book/en/Distributed-Git-Distributed-Workflows ○ https://www.atlassian.com/git/workflows ● Semantic Versioning ○ http://semver.org/