Easy partial branch merging in git

Recently I have been trying to diversify my usage of source code control so as to be more familiar with the different tools that are currently popular so I have been using git more for personal projects and recently I came across a process hurdle that didn’t seem to have a simple solution:

  • We have a project in git hosted as a private repo at GitHub
  • We have multiple contributors
  • Development is happening in a development branch
  • development contains many commits that we don’t want in master because of the differences between production and development environments
  • development also contains code we don’t want to release yet
  • We want to maintain attribution for code changes in what is merged to master

All in all, it felt like this should be simple, right, surely I can just git checkout master && git merge development {path_to_folder_containing_code} right … well not really.

Continue reading “Easy partial branch merging in git”

my new favourite one liner

Well last weeks bug hunt went well by all accounts we managed to convince Ryan to make 30 commits and about 100 tickets were closed. During the process of testing all these patches I found a new favourite one-liner for working with trac and patches:

svn revert -R * && curl "trac-patch-raw-fileurl" | patch -p0

This enables you to download a patch direct from the trac web interface and apply it against your local svn checkout ensuring to revert any other local changes first. For example using this with the patch attached to ticket 3110:

svn revert -R * && curl "http://trac.wordpress.org/attachment/ticket/3110/3110.diff?format=raw" | patch -p0

Windows WordPress Toolbox

In preparation for the first WordPress Bug Hunt this weekend Mark Jaquith has written some excellent instructions on how he “does work” on WordPress on Linux / Mac OS X.

Skippy who is one of the hosts of the bug hunt was looking for a Windows version of Mark’s cheat sheet – So here or those of you using Windows the following instructions show you how to achieve the same things.

First of all you need to install an svn client, the svn client of choice on Windows has to be TortoiseSVN which is not only a subversion client but also includes patch application functionality and visual merge tools. Once you have installed TortoiseSVN you will now be set and ready. So here is the “Working on Windows” version on Mark’s instructions:
Continue reading “Windows WordPress Toolbox”