title: Lines of code not to change during staging / development merge
body: <p>I currently have a server I deploy Rails apps to via Capistrano and Passenger. I deploy via a Github repo with two branches development and staging.</p>
  
  <p>When merging the staging branch to the master (development) there are certain files such as the database.yml, mailers and other things are different that I don't want to be merged with master - I just want the master files to be kept. </p>
  
  <p>I have found a solution that works quite well that is: <pre>git update-index --assume-unchanged </pre> on the files I don't want changed - however I recently noticed my dev site was being indexed by google so I want to add:</p>
  
  <pre><code>&lt;meta name="robots" content="noindex"&gt; 
  </code></pre>
  
  <p>to the layout to stop indexing on the dev site and obviously I don't want that on the live site so the git assume unchanged will work, however this means any additional changes that do need to be pushed to master on the layout file will be ignored because of assume unchanged.</p>
  
  <p>I was just wondering the best work flow for merging staging branches with development for my situation. </p>
  
  <p>Thanks in advanced.</p>