<?xml version="1.0" encoding="UTF-8"?><rss version="2.0"
	xmlns:content="http://purl.org/rss/1.0/modules/content/"
	xmlns:dc="http://purl.org/dc/elements/1.1/"
	xmlns:atom="http://www.w3.org/2005/Atom"
	xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
		>
<channel>
	<title>Comments on: Better Application Deployment</title>
	<atom:link href="http://www.littlehart.net/atthekeyboard/2009/11/27/better-application-deployment/feed/" rel="self" type="application/rss+xml" />
	<link>http://www.littlehart.net/atthekeyboard/2009/11/27/better-application-deployment/</link>
	<description>Facebook should&#039;ve be written in unicornSchemaLang, because everyone *knows* that PHP is no good for anything, right?</description>
	<lastBuildDate>Thu, 09 Sep 2010 20:57:35 +0000</lastBuildDate>
	<sy:updatePeriod>hourly</sy:updatePeriod>
	<sy:updateFrequency>1</sy:updateFrequency>
	<generator>http://wordpress.org/?v=3.0.1</generator>
	<item>
		<title>By: Francis</title>
		<link>http://www.littlehart.net/atthekeyboard/2009/11/27/better-application-deployment/comment-page-1/#comment-15026</link>
		<dc:creator>Francis</dc:creator>
		<pubDate>Sat, 19 Dec 2009 23:30:23 +0000</pubDate>
		<guid isPermaLink="false">http://www.littlehart.net/atthekeyboard/?p=621#comment-15026</guid>
		<description>With my clients I&#039;ve started using &#039;git push&#039; to deploy to the servers. On the server I have the working copy in a &quot;production branch&quot;. I ssh in and check for local modifications, and then do a &#039;git merge master&#039; if there are none. If there is local modifications I check what&#039;s going to be updated &#039;git diff master&#039; and if nothing conflicts I can just merge. If they&#039;ve edited some of the same files I have, I can usually just stash their changes and then pop the stash after a merge.

It doesn&#039;t sound simple, but it keeps me on top of every change and lets me know if they&#039;re editing something I should change in the source.

That and database migrations have made my job a *lot* easier.</description>
		<content:encoded><![CDATA[<p>With my clients I&#8217;ve started using &#8216;git push&#8217; to deploy to the servers. On the server I have the working copy in a &#8220;production branch&#8221;. I ssh in and check for local modifications, and then do a &#8216;git merge master&#8217; if there are none. If there is local modifications I check what&#8217;s going to be updated &#8216;git diff master&#8217; and if nothing conflicts I can just merge. If they&#8217;ve edited some of the same files I have, I can usually just stash their changes and then pop the stash after a merge.</p>
<p>It doesn&#8217;t sound simple, but it keeps me on top of every change and lets me know if they&#8217;re editing something I should change in the source.</p>
<p>That and database migrations have made my job a *lot* easier.</p>
]]></content:encoded>
	</item>
	<item>
		<title>By: Travis Swicegood</title>
		<link>http://www.littlehart.net/atthekeyboard/2009/11/27/better-application-deployment/comment-page-1/#comment-14902</link>
		<dc:creator>Travis Swicegood</dc:creator>
		<pubDate>Mon, 30 Nov 2009 15:02:16 +0000</pubDate>
		<guid isPermaLink="false">http://www.littlehart.net/atthekeyboard/?p=621#comment-14902</guid>
		<description>Another option is to use PEAR then use the include_path for files that need to be modified.  You end up with base/ and custom/.  Tell the client to copy anything out of base/ that they want to modify, then you&#039;re set.  Just make sure you never package anything in the custom/ directory.</description>
		<content:encoded><![CDATA[<p>Another option is to use PEAR then use the include_path for files that need to be modified.  You end up with base/ and custom/.  Tell the client to copy anything out of base/ that they want to modify, then you&#8217;re set.  Just make sure you never package anything in the custom/ directory.</p>
]]></content:encoded>
	</item>
</channel>
</rss>
