title: Git merge after hard reset
body: <p>This is the sequence</p>
  
  <ol>
  <li>Merged changes from master to dev</li>
  <li>Worked on dev, committing some changes</li>
  <li>Checkout master, did a hard reset to HEAD~1</li>
  <li>Checked out dev, tried to merge master</li>
  <li>Nothing happens</li>
  </ol>
  
  <p>How can I bring the changes from the reset master branch into dev?</p>