Developing with WordPress and Git

Rob Miller • @robmilBig Fish Design

1Friday, 23 November 12

An introduction

“Git”? Huh?What’s that?

• A distributed version control system

• Free

• Open source

• Free

• Open source

• Popular

A crash course in version control

What isversion control?

• Track changes made to source code

• Who did what and when

• When things break, revert to the point when it last worked

• Like Time Machine for your website’s code (but not database/content…)

Why version control?

• “I just deleted a file by mistake — can we get it back?”

• “I need to know who made this change — can we find out?”

• “That feature just broke the site — can we revert it?”

• “There’s a bug that didn’t use to exist. When was it introduced?”

Centralisedvs. distributed

Centralisedversion control

• History stored in a central repository running on a server

• Everyone commits to and from this repository

• Examples: CVS, Subversion (SVN), Perforce, ClearCase

Distributedversion control

• No central server

• Every team member has a copy of the entire repository and its history

• Git isn’t the only option — e.g. Mercurial

Advantages of DVCS

• Redundancy

Advantages of DVCS

• Redundancy

• Offline working

Advantages of DVCS

• Redundancy

• Offline working

• Speed

Git ≠ GitHub

Terminology, part one

•Commit

•Branch

•Commit

•Branch

•Tag

•Commit

•Branch

•Tag

•Diff

•Commit

•Branch

•Tag

•Diff

•Commitish

Terminology, part two

• Pulling

• Pushing

• Pulling

• Pushing

• Cloning

What’s in a Git commit?

Branches

• In Subversion, they’re basically useless

Branches

• In Git, they’re at the heart of almost everything

Branches

• Juggle as many different versions of your code as you like

Branches

• Keep all your features nice and separate

Branches

• Keep all your features nice and separate

• Merge painlessly once you’re done

Special branch

• Git doesn’t force you to have any particular branches

Special branch

• But by convention, master is your stable branch

Special branch

• But by convention, master is your stable branch

• Branch from it; merge to it; your releases are taken from it

Branch commands

• git branch foo will create a branch called “foo”.

Branch commands

• git checkout bar will switch to the branch called “bar”

Branch commands

• git checkout bar will switch to the branch called “bar”

• git branch -d foo will delete a branch if you change your mind about it

Branch commands

Merging

• Once you’re done with a branch, you can merge it into another:

$ git checkout master$ git merge --no-ff foo

Merging

When shouldyou branch?

• For individual features

• What does that mean, though?

• Generally: anything that might be put live independently

Setting up a repository

$ git init

Working with a team

A typical team setup

The rest of the team

Staging

ProductionYou

• Scripts that run after certain events — just like actions in WordPress

• Potential uses:

• Post a message in an IRC channel when someone pushes

• Potential uses:

• Deploy to the live site when someone pushes on master

• Potential uses:

• Deploy to the live site when someone pushes on master

• Run a syntax checker/strip whitespace/etc. before commits

Git and WordPress

Things to exclude

• wp-config.php

Things to exclude

• wp-config.php

• wp-uploads/* (or perhaps not…)

Things to exclude

• wp-config.php

• wp-uploads/* (or perhaps not…)

• Anything that might conceivably be different on live vs. development

Image uploads

• Image uploads inevitably happen on live

Image uploads

• Are they content (so should be excluded from Git)?

Image uploads

• Are they content (so should be excluded from Git)?

• Or are they layout/template related (so should be included in Git)?

Potential solutions

• Ignore them — don’t have them in Git at all

Potential solutions

• Periodically add them into Git from the live server

Potential solutions

• Automate the adding of them e.g. with a WordPress hook

Potential solutions

• Automate the adding of them e.g. with a WordPress hook

• Which solution depends on the nature of your images

Plugin/core upgrades

• If they happen on live, you’ll end up with untracked files/uncommitted changes to your live files

• Doing them on live is insane regardless, so it makes double sense to stop doing it

Solutions

• Disable upgrades/plugin installs on your live sites, do upgrades locally, then deploy to live

Solutions

• Remove install_plugins, install_themes, update_plugins, update_themes, update_core capabilities from your users on live

Solutions

• Remove install_plugins, install_themes, update_plugins, update_themes, update_core capabilities from your users on live

• define('DISALLOW_FILE_EDIT', true); in your live wp-config.php

Useful resources

• “Think Like a Git”: http://think-like-a-git.net/

• GitRef: http://gitref.org/

• ProGit: http://git-scm.com/book

• Useful Git tips: http://mislav.uniqpath.com/2010/07/git-tips/

• “So, I’ve tried Git” by Ozh http://planetozh.com/blog/2012/11/so-ive-tried-git-and-its/

• Migrating an SVN repo to Git: http://john.albin.net/git/convert-subversion-to-git

Git GUIs

• Use the command line first!

Git GUIs

• But on Windows: Tortoise Git

Git GUIs

• On OS X: Tower, GitBox, Gitti

Git GUIs

• On OS X: Tower, GitBox, Gitti

• On Linux: giggle, gitg, QGit

And finally…

• Jeff’s leaving! :(

And finally…

• We’re hiring! :)

And finally…

• We’re hiring! :)

• Apply online: http://bit.ly/SZJJ8v

or email: rob@bigfish.co.uk

Developing with WordPress and Git

Technology

Transcript of Developing with WordPress and Git

HI THERE, - 2016.antwerp.wordcamp.org · HI THERE, I'M MARK (WITH A K) Dad, Front-end lover, author, teacher, WordPress enthousiast. WORDPRESS DEPLOYMENT WITH GIT HOW TO KILL YOUR

Lessons we learned developing infrastructure software at Box · # git flow hotfix start 1.2.4 # bumpversion patch # git flow release publish 1.2.4 • ! PR ⭃ develop, PR ⭃ master

You Got Your WordPress in my Facebook: Developing WPBook

PetaLinux Tools Documentation - Xilinx · git git 1.8.3 git 1.7.1 git 1.7.1 git 1.8.3 git 1.8.3 git 1.7.1 or above ... If yo u wish to keep the license for your records, ... • Clean

Johan Herland €¦ · The Git Parable Git - simple & powerful git init git add … git commit … git branch … git checkout … git tag … git diff …

Intro to Developing Web Sites with WordPress and AngularJS

WordPress · at a moderate level of expertise in developing sites or blogs using WordPress. ... Download the WordPress zip ... WordPress folder and upload it into your web ...

Version Control with Git - lucydot.github.io · Configuring Git • git config Creating a repository • git init, git status Tracking the changes to your files • git add, git commit,

Things I Wish I Had Known Before Developing a WordPress Theme

WordCamp Europe 2013 Git & WordPress-Themes

Git, smart git & gitflow

Git Tricks — git utilities that make life git easier

CS140 Project 1: Threads - Stanford University · git basics git add git commit git pull git push git merge git branch * Lots of git tutorials and help available online

Designing & Developing for Content in WordPress

Git & Git Workflows

WordCamp Bucharest 2009 - Developing a WordPress theme

Using Git with WordPress - Presented by Nigel Rodgers.

Handy Resources for Developing a WordPress Website

Git Best Practices - MariaDB.org...$ git push Write a good commit message! Regular git workflow $ git checkout bb-10.2-bug $ # Code, build, test... $ git add . $ git commit $ git push

ALaboratoryIntroductionto git and GitHubnewton.cx/~peter/files/git-lab-handout.pdf · git status, git checkout 7 Topic 3: git status, git checkout Fundamentally, Now,insomecircumstancesHEAD