title: Git: how to update branch with master?
body: <p>This is my situation:</p>
  
  <ul>
  <li><p>I have started a new branch (let's call it <code>foo</code>) and did some work on that,</p></li>
  <li><p>I have pushed <code>foo</code> to remote</p></li>
  <li><p>something needed to be done on <code>master</code>, so I switched to master, did the fixes and pushed,</p></li>
  </ul>
  
  <p>Now: how do I update <code>foo</code> with <code>master</code>? Because I need to work on <code>foo</code>, but I want it to be aligned with the changes in <code>master</code>. I understand I am not supposed to <code>rebase</code> a branch that has been published...</p>
  
  <p>Thanks!</p>