title: Git: handling an appcache?
body: <p>I'm hosting an OSS project on GitHub that has a few different developers. This project is a web application that is using an AppCache to tell the browser which files should be made available offline.</p>
  
  <p>It's the nature of the appcache file that it needs to be updated (e.g. we are using a timestamp in a comment for that) once a file in the cache is changing to invalidate the cache and to force the browser to reload all files.<br>
  When people are working now on different development branches they are updating the timestamp in the appcache with each of their commits.</p>
  
  <p>The problem is now, that this will create conflicts that are preventing an automatic merge.</p>
  
  <ul>
  <li>How can this be solved in a way that not conflicts will happen again in the future?</li>
  <li>What are other development teams doing at the same situation?</li>
  </ul>
  
  <p>Using CVS I could replace the timestamp with a $Id$ to let the program handle it automatically...</p>