The basics of using version control using WordPress and Git. Also includes a sprinkling of deployment using Beanstalk.

1. FTP Commando to Git Hero
WordCamp Denver
November 16, 2013

2. Organize Fort Collins WordPress meetup
3 plugins on the WordPress repository
Build themes and plugins

5. 1. What is version control,
and why use it?
and why use it?

6. 2. How to use version control
with WordPress
with WordPress

7. 3. Adding deployment to
your workflow
your workflow

8. What is version control?

9. me, pre-version control

10. Dated Folders

11. Problem #1
How do you access deleted code?

12. Problem #2
How do you effectively collaborate?

13. Problem #3
How do you know what change is in what folder?

14. Really long, descriptive folder names

15. Version Control
Provides a history of changes made
to files in a project

16. Version Control
Provides a history of changes made
to files in a project

17. Repository

18. Repository

19. Git
A popular vcs created in
2005 by Linus Torvalds, the
creator of the Linux kernel

20. Distributed
Everyone has their own copy of the project
Don’t need a network connection
No central repository

21. Distributed Version Control System
Server
repo
Computer A
repo
Computer B
repo

22. That’s all great, but how do I use it?

23. Fort Collins Lambkins

25. Interacting with Git

26. Terminal

27. Remember keyboarding class?

30. git-scm.com/downloads

31. git init

32. git add <filename>

33. Staging
File 1
File 2
File 3
Repository

34. git commit -m “Initial commit”

35. Good Commit
Messages
1. Add navigation to header
2. Remove slider from homepage

36. Bad Commit
Messages
1. Fixed that thing that was broken.
2. Edited some code. Now I need a beer.

37. You are now using
version control!
QuickTime™ and a
GIF decompressor
are needed to see this picture.

38. git log

40. git status

41. git commit -a -m “Commit Message”

42. git log

44. git status

45. git add .
git commit -m “Add stylesheet”

46. How often should I
commit?
Is there a good commit message I could write?

47. Using Version Control
with WordPress
with WordPress
+

48. 1. Install a fresh copy of WordPress
2. Initialize a new git repository
3. Create a .gitignore file
4. Add the current files to staging
5. Commit those files to the repository as the first commit

49. 1. Install a fresh copy of WordPress

50. 2. Initialize a new git repository
git init

51. 3. Create a .gitignore file

52. 4. Add current files to staging
git add .

53. 5. Commit staged files to the repository
git commit -m “Initial commit”

54. +
!

55. 1. Make changes to files.
2. Add those changed files to staging.
3. Commit staged files to the repository.
4. Repeat.

56. Real World Examples

57. Scenario #1
The Client Changes
Their Mind
The Client Changes
Their Mind

58. Check the project’s commit history
git log

59. Go back in time
git checkout <commit identifier>

61. Scenario #2
Collaborate with
Another Developer
Collaborate with
Another Developer

62. Remote Hosting Options

63. Setup Connection to Remote Repository
git remote add origin <path_for_remote>
Server
repo
Computer A
repo

64. Send Repository to Remote Server
git push origin master
Server
repo
Computer A
repo

65. Developer Copies Repository Locally
git clone <url>
Server
repo
Computer A
repo
Computer B
repo

66. Developer Connects to Repository
git remote add origin <path_for_remote>
Server
repo
Computer A
repo
Computer B
repo

67. Developer Pushes Up Their Changes
git push origin <branch>
Server
repo
Computer A
repo
Computer B
repo

68. View Commit History

69. Branches

70. master
branch
branch

71. Why?
Stay more organized
Easily maintain your “in-progress” work separate from
your completed, tested, and stable code
Collaborate with others more effectively

72. master
Build features in branches
branch
merge
feature
bug
fix

73. Tips
Only commit finished work to the master branch
Create branches for features and large bug fixes
Delete feature branches once merged

74. Create New Branch
git branch <branch_name>
git checkout <branch_name>
master
branch

75. master
Build Cool Feature
branch

76. Merge Completed Feature
git checkout master
git merge <branch_name>

77. Merge Completed Feature
master
branch

78. Keep Your Repository Clean
git branch -d <branch_name>
master

79. Deployment

80. Push code. Deploy in one click.

81. Setup Repository

82. Set Permissions

83. Create Remote Repository

84. Create Your Remote
git remote add beanstalk <url>

85. Send Files to Your Remote
git push beanstalk master

86. Create Deployment Environment

87. Add Server to Environment

88. Test Connection Settings

89. Deploy!

90. Resources
Beanstalk Guides - http://guides.beanstalkapp.com
Git Book - http://git-scm.com/book
Git Immersion - http://gitimmersion.com/
Git Basics - http://teamtreehouse.com/library/git-basics

91. Questions?
@greenhornet79
endocreative.com