Comments on: Creating Wordpress Themes with Blueprint and Sandbox http://www.arciris.com/latest/design/creating-wordpress-themes-with-blueprint-and-sandbox/ Website Design in Spain Wed, 07 Jan 2009 13:55:38 +0000 http://wordpress.org/?v=2.7 hourly 1 By: Guy http://www.arciris.com/latest/design/creating-wordpress-themes-with-blueprint-and-sandbox/comment-page-1/#comment-15988 Guy Thu, 30 Oct 2008 15:27:42 +0000 http://www.arciris.com/?p=166#comment-15988 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 ;) 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 ;)

]]> By: jan http://www.arciris.com/latest/design/creating-wordpress-themes-with-blueprint-and-sandbox/comment-page-1/#comment-15987 jan Thu, 30 Oct 2008 15:07:08 +0000 http://www.arciris.com/?p=166#comment-15987 "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. “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.

]]>