title: Git merge in the wrong direction?
body: <p>Git still confuses me from time to time!</p>
  
  <p>I have a staging and a master branch. Usually development occurs on the staging branch, which gets merged into master periodically.</p>
  
  <p>However some commits have been made directly to the master branch. This means that the updates are missing from the staging branch.</p>
  
  <p>How to I bring my staging branch back up to date with the master? Am I right in thinking merges should always occur in one direction (i.e. staging > master) and the merging master > staging is not the way to go? </p>