title: git - update all branches to use same version of file
body: <p>I seem to have 2 different versions of a <code>site.conf</code> file in different branches.</p>
  
  <p>Is there a way to tell git that all branches should update the version of the file they are tracking to that used by <code>master</code>?</p>