Creating Wordpress Themes with Blueprint and Sandbox

Tags:

  1. jan’s avatar

    “you have to change the header.php file as shown in Michael’s tutorial, so you have to tell SVN not to update the header.php file”

    In fact, svn *merges* your edits to header.php i.e. you still keep them after an “svn up” or “svn sw”. The edits in Michael’s tutorial simply add to the file, there’s no substitution or deletion in this case. SVN determines when its safe to merge your edits and when a conflict requires your attention.

    Keep an eye on the initial capitals in the svn output: Updated, merGed, Conflict.

  2. Guy’s avatar

    Ok thanks for that Jan, I didn’t realise that SVN was so clever- I’m only about a third of the way through the SVN book at the moment ;)

  3. admin’s avatar

    Thanks for that BroN, I will try the method you show there.

  4. BroN’s avatar

    I just wanted to emphasize the I do not show a method I just point to it. :D I read your article recently and thought of placing a link here! Cheers!