title: Git merge master branch into some other branch
body: <p>I have a master branch where my master-app is.</p>
  
  <p>I am expanding the app with a webshop module on top of the master-app.</p>
  
  <p>When i do changes to the master app, i want them to also be in the webshop-app?</p>
  
  <p>When i now do git checkout webshop, the changes i made to master are lost, and i have to copy past them into webshop.</p>
  
  <p>What i do now:</p>
  
  <pre><code>git checkout master
  git add .
  git commit -m "changes made to master application"
  git push origin master
  
  git checkout webshop
  // copy and paste my changes here
  git add .
  git commit -m "Changes also made here"
  git push origin webshop
  </code></pre>
  
  <p>I tried this: </p>
  
  <pre><code>git push origin master webshop
  </code></pre>
  
  <p>But this is only pushing for the commit in the branch i am in atm</p>