title: How often should I merge changes commited on master - to my other git branches?
body: <p>If I have a <code>master</code> branch. </p>
  
  <p>I then checkout a <code>work</code> branch and make awesome changes, and some commits.</p>
  
  <p>Then I have to fix something so I go back to <code>master</code> and checkout a branch called <code>fix</code>, fix what I need to do, and merge it into <code>master</code>.</p>
  
  <p>My question is, should I then merge <code>master</code> onto <code>work</code> and continue, or should I continue on <code>work</code> where I was and merge it when I'm done?</p>
  
  <p>I find myself having to go back to all the branches I work on and updating (merging changes to) each branch.  </p>
  
  <p>I get the feeling it's best to merge asap, but then find myself having to continuously update all the branches I work on. Is this unnecessary?</p>