What a great first show! Finally got the timezones all squared away between NYC and Brisbane. Today Bronson and I just had a quick chat about Version Control. We ran into some stumbling blocks which we’ve discussed how we got around them and address them moving forward in our day-to-day. We discuss some great tips and how we use Git within our WordPress development workflow.
Hopefully you’ll enjoy this 50 min chat and can help us out with some ways that you are using version control within your daily process. Be kind, this is the first one and we promise that we’ll get better as we move along. Practice makes perfect, right? We’d appreciate any feedback you have even if it’s not about the topic, but about how we sound, what you would like to see, anything at all.
Two questions that I think we posed out to the community were: 1. How can us command line junkies make sure we pull the latest before we try and push our changes? 2. How you bottle up an inherited project? Core? Just a theme?
WordPress Core Official Git mirrors: http://make.wordpress.org/core/2014/01/15/git-mirrors-for-wordpress/
Git branching method – Git Flow
Sublime Text plugin – Git Gutter
git add -p – Patch mode to pick and choose which bits you want as a part of your commit
git commit -m --amend – Edit you last commit message
git diff-tree --no-commit-id --name-only -r [SHA] – See what files were affected in a specific commit