title: How do I get changes from my trunk into a branch?
body: <p>I've just started using Git and find that whilst I am implementing a feature in a branch, I will encounter some bug that really needs to be pushed to the trunk as soon as possible. In order to do so, I use checkout to switch back to the trunk, make my changes and commit them. I now have a trunk that is bug free.</p>
  
  <p>Unfortunately, my branch needs to have this bug fixed as well. As the feature is not complete, I can't just merge the branch back into the trunk. How can I alter my branch so that it receives the changes I made to the trunk?</p>
  
  <p>If it matters, I am developing on my own and so only have a single repository to worry about.</p>
  
  <p>I am using TortoiseGit so instructions specific to that would be helpful but not necessary.</p>