title: What shall I do if someone pushed new commits to master of git repository after I merged my work to master but didn't push?
body: <p>I'm just starting using GIT. Consider a very small team with only 2 developers: devA and devB.</p>
  
  <p>Here is the scenario:</p>
  
  <ol>
  <li>They are all working based on commit ver-01. </li>
  <li>DevA committed ver-02 and pushed to the central repo. </li>
  <li>DevB push his/her ver-03 but failed, so devB fetched the master and now has a master which contains ver-03 and origin/master which contains ver02. He/she merged master with origin/master and now has ver-04 which contain both ver-02 and ver-03, and then push it to central repository normally.</li>
  </ol>
  
  <p>What I want to know is, when DevB is merging the code, DevA pushed another ver-05. So after DevB merged his/her master with origin/master, he/she still cannot push, for he/she have to resolve the conflict between ver-04 and ver-05. If I'm DevB, I ran 'git fetch origin master', but what command shall I run to merge? I tried 'git merge origin master' but it tells me 'Already up-to-date.', but when I push it failed.</p>
  
  <p>I found that there are actually 3 branches:</p>
  
  <ul>
  <li>master --> contains my change, which is ver-03</li>
  <li>origin/master --> contains the latest remote change, which is ver-05</li>
  <li>HEAD -> origin/master --> contains the ver-04, which is merged from ver-02 and ver-03.</li>
  </ul>
  
  <p>What shall I do next?</p>