git merge

If this course was an episode of MTV Cribs, this would be the moment where I said “this is where the magic happens”. Git merge can be used to merge two versions of your files. It is mainly used to merge two branches together, say a feature branch into the master branch. If you use GitHub or Bitbucket, they will mostly be in charge of merging your files, which is why I almost never run git merge myself.

All Lessons

Level up with WP Pusher

Take the pain out of WordPress development. Manage your code with Git and never again deploy files over FTP.

When I came across WP Pusher, I knew I had found the answer and it's now a vital part of our workflow!

Ashley Hart, Green Chilli
GitHub user, runs his local WordPress agency with WP Pusher

WP Pusher makes deploying changes to our websites quick and easy. We could not manage without it.

Simon Appleby, Bookswarm
Bitbucket user, manages 100+ WordPress sites with WP Pusher