Dev objective2015 lets git together
•
0 likes•387 views
Version Control with Git for teams
Recommended
More Related Content
What's hot
What's hot (20)
Viewers also liked
Viewers also liked (20)
Similar to Dev objective2015 lets git together
Similar to Dev objective2015 lets git together (20)
More from ColdFusionConference
More from ColdFusionConference (19)
Recently uploaded
Recently uploaded (20)
Dev objective2015 lets git together
- 1. Let’s Git Together GIT STRATEGIES FOR TEAMS
- 2. Me: Scott Coldwell ‣ DevOps ‣ Computer Know How ‣ Houston, TX ‣ @scottcoldwell ‣ CF dev since 2006 ‣ Git since 2013 ‣ 2nd ever tech presentation
- 3. ‣ DO IT ‣ Track changes ‣ Backups ‣ Manage deployments Source Control
- 4. ‣ COMMUNICATION ‣ Standards ‣ Process ‣ Expectations Source Control
- 5. ‣ Branching! ‣ Forking! ‣ Pull requests! ‣ Distributedness! ‣ Conflicts! ‣ Other SC systems had (most of) these too! The Blessings of Git
- 6. ‣ Team makeup and competency ‣ Will you be the bottleneck? ‣ Who will approve code promotion? ‣ How much do you trust your developers? Selection Criteria
- 7. ‣ Business and/or Project process ‣ Ticketing system and workflow ‣ Environments - testing / staging / qa / ci / beta / etc ‣ Deployment process and schedule ‣ Automation (Continuous Integration/Delivery) Selection Criteria
- 9. ‣ Wing and a Prayer ‣ Long-Running Branches ‣ Git Flow ‣ Branch-per-Feature Strategies
- 10. ‣ Single Branch ‣ Commit when you want to ‣ Deploy with tags? ‣ Careful ‣ Unfinished code could creep in ‣ Unclear what’s in production Wing and a Prayer
- 11. Wing and a Prayer
- 12. ‣ One branch for development, one for production ‣ Cherry pick commits to deploy ‣ Tag production branch ‣ Cleaner history in Git than SVN Long Running Branches
- 14. ‣ Careful: ‣ Branches will diverge ‣ Not developing on production code ‣ Tedious to keep track of commits for a change ‣ Cumbersome to revert Long Running Branches
- 15. ‣ Long-running branches, but with merging ‣ Specific branches and rules around features, hotfixes, bugs ‣ EVERYTHING in the develop branch WILL be merged to master, once it is stable ‣ Pull requests are powerful Git Flow
- 17. ‣ Powerful for fast-moving teams ‣ Great separation between dev and prod ‣ Many toolsets available ‣ Much responsibility given to developers Git Flow Pros
- 18. ‣ Much responsibility given to developers ‣ Hard to pull stuff back ‣ Frustrating for project managers ‣ Limited number of environments Git Flow Cons
- 19. ‣ Master represents production ‣ Every feature and hotfix gets a branch ‣ Nothing is merged until prod deployment ‣ Utilize “throw away” branches for various environments ‣ A build process reruns when branches are added/ removed Branch per Feature
- 22. ‣ Allows for limitless environments ‣ Restrict who can merge to master ‣ Granular control over code progression ‣ Easy to remove branches from an environment ‣ We can always deploy BPF Pros
- 23. ‣ Code conflicts can be tricky to track down ‣ Requires some automation ‣ Pull requests are used less frequently ‣ Training for team BPF Cons
- 25. ‣ Team makeup and competency ‣ Will you be the bottleneck? ‣ Who will approve code promotion? ‣ How much do you trust your developers? Selection Criteria
- 26. ‣ Business and/or Project process ‣ Ticketing system and workflow ‣ Environments - testing / staging / qa / ci / beta / etc ‣ Deployment process and schedule ‣ Automation (Continuous Integration/Delivery) Selection Criteria
- 27. ‣ Git Flow ‣ http://nvie.com/posts/a-successful-git-branching-model/ ‣ http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/ ‣ Branch per Feature ‣ https://www.acquia.com/blog/pragmatic-guide-branch- feature-git-branching-strategy ‣ http://dymitruk.com/blog/2012/02/05/branch-per-feature/ Further Reading
- 28. Thank You