2. ABOUT US
Jeremy Pry
@JPry
WP Engine
jeremypry.com
@jpry Ÿď @liamdempsey
WordCamp Philly 2014
Liam Dempsey
@liamdempsey
LBDesign
liamdempsey.com
DEVELOPER DESIGNER
3. KEY TAKEAWAYS
â˘âŻ Version control is NOT an option
â˘âŻ Making version control work for you
isnât impossible; it is manageable
â˘âŻ Organization + workflow:
How version control fits into
your workflow
@jpry Ÿď @liamdempsey
WordCamp Philly 2014
4. SOME INITIAL THOUGHTS
â˘âŻ Using Git and GitHub via the app is
NOT that difficult
â˘âŻ Even version control as a concept is
pretty straightforward
â˘âŻ Itâs understanding the workflow
that can prove daunting
@jpry Ÿď @liamdempsey
WordCamp Philly 2014
5. A FEW CAVEATS
â˘âŻ You will not leave this talk as Git
or GitHub expert
â˘âŻ Weâll share resources on how to use
the GitHub app
@jpry Ÿď @liamdempsey
WordCamp Philly 2014
12. YOUR DESIGN + DEV TEAM
@jpry Ÿď @liamdempsey
WordCamp Philly 2014
â˘âŻ Single Designer
â˘âŻ Small Team (5
people or less)
â˘âŻ Large Team (6
people or more)
13. THE FLOW OF CODE
@jpry Ÿď @liamdempsey
WordCamp Philly 2014
â˘âŻ Add Repository to GitHub.com
â˘âŻ Pull Repository to Local Machine
â˘âŻ Edit with Text Editor
â˘âŻ Push to GitHub
â˘âŻ Push to Dev Server
â˘âŻ Push to Web Host
15. FLOW OF CODE: SINGLE USER
@jpry Ÿď @liamdempsey
WordCamp Philly 2014
Production"
Server"
Development"
Server"
Clone repository via Git"
Your
Computer"Push commits via Git"
16. FLOW OF CODE: SMALL TEAM
@jpry Ÿď @liamdempsey
WordCamp Philly 2014
Production"
Server"
Development"
Server"
Clone repository + pull updates"
Push commits"
Your
Computer"
Teammateâs"
Computer"
Teammateâs"
Computer"
Push updated code via SFTP"
17. THINKING ABOUT TREES
@jpry Ÿď @liamdempsey
WordCamp Philly 2014
â˘âŻSingle Branch
â˘âŻMulti Branch:
master +
development
18. SINGLE USER TREE
@jpry Ÿď @liamdempsey
WordCamp Philly 2014
MASTER!
Branch"
DEV!
Branch"
Commits"
19. MULTI BRANCH TREE
@jpry Ÿď @liamdempsey
WordCamp Philly 2014
MASTER!
Branch"
DEV!
Branch"
FEATURE 1!
Branch"
FEATURE 2!
Branch"
Merge dev
into master"
Merge dev
into master"
Merge
feature into
dev"
20. GETTING STARTED
@jpry Ÿď @liamdempsey
WordCamp Philly 2014
â˘âŻ Create a GitHub account
â˘âŻ Add a repository
â˘âŻ Clone it your computer
â˘âŻ Code on!
22. @jpry Ÿď @liamdempsey
WordCamp Philly 2014
RESOURCES
Git Succinctly eBook: http://www.syncfusion.com/resources/techportal/ebooks/git?utm_medium=BizDev-Nettutsplus0613
Git Succinctly series of articles: http://code.tutsplus.com/series/git-succinctly--net-33581
Understanding the GitHub Flow: https://guides.github.com/introduction/flow/index.html
Distributed Git - Distributed Workflows: http://git-scm.com/book/en/Distributed-Git-Distributed-Workflows
Intro to Git for Web Designers: http://www.webdesignerdepot.com/2009/03/intro-to-git-for-web-designers/
TheThing About Git: http://tomayko.com/writings/the-thing-about-git
Understanding the Git Workflow: https://sandofsky.com/blog/git-workflow.html
Team Collaboration with GitHub: http://code.tutsplus.com/articles/team-collaboration-with-github--net-29876
Lots of other articles: http://code.tutsplus.com/categories/git
A Successful Git Branching Model: http://nvie.com/posts/a-successful-git-branching-model/
GitHub Help: https://help.github.com/
Aha! Moments When Learning Git: http://betterexplained.com/articles/aha-moments-when-learning-git/