You already got something like this built in: Revisions. // Define the nr of saved revisions in your wp-config.php define( ‘WP_POST_REVISIONS’, 30 ); You can simply grab them by calling get_posts() with a post_type of revision. To show the difference between two revisions simply use wp_text_diff(). // Example $revisions = get_posts( array( ‘post_type’ => ‘revision’ … Read more
I am not sure how much you know about using version control, but I recently switched from SVN to Git and find that to be great! Though it depends in you live site’s server has Git installed (or will let you). I have a Git setup on the live server also, running off a branch … Read more
I have a setup I’m pretty proud of, and it works extremely well for my team. General Structure I keep the entire installation under git. All changes, be it a system update, adding/updating a plugin, adding/updating a theme, go through the same workflow. Changes can be rolled back at a moment’s notice. I have a … Read more
Here is how I do it and I haven’t come across anything better than this. I keep a different version of wp-config.php file under version control and then keep a file one directory above which holds all the database credentials and salts/keys. Also this way, I am able to distinguish between the type of setup … Read more
On Windows, a good 3-way diff/merge tool remains kdiff3 (WinMerge, for now, is still 2-way based, pending WinMerge3) See “How do you merge in GIT on Windows?” and this config. Update 7 years later (Aug. 2018): Artur Kędzior mentions in the comments: If you guys happen to use Visual Studio (Community Edition is free), try the tool that is shipped with it: vsDiffMerge.exe. It’s … Read more
fetch, merge, and pull git fetch and git merge origin/master will fetch & integrate remote changes. Let me explain a common scenario. origin/master is at C. Someone pushed D. You worked on E & F. Note that you will not see D in your local repository until you run git fetch. Now you run git fetch. Now you can see … Read more
UPDATE: You can add other branches to exclude like master and dev if your workflow has those as a possible ancestor. Usually I branch off of a “sprint-start” tag and master, dev and qa are not ancestors. First, list locally-tracking branches that were merged in remote (you may consider to use -r flag to list … Read more
Good or bad news for you, that hash IS the revision number. I also had trouble with this when I made the switch from SVN to git. You can use “tagging” in git to tag a certain revision as the “release” for a specific version, making it easy to refer to that revision. Check out … Read more
To see the diff for a particular COMMIT hash, where COMMIT is the hash of the commit: git diff COMMIT~ COMMIT will show you the difference between that COMMIT‘s ancestor and the COMMIT. See the man pages for git diff for details about the command and gitrevisions about the ~ notation and its friends. Alternatively, … Read more
It comes down to whether the feature is used by one person or if others are working off of it. You can force the push after the rebase if it’s just you: However, if others are working on it, you should merge and not rebase off of master. This will ensure that you have a … Read more