title: Not able to push after resolving merge conflicts
body: <p>My friend and I had made changes to same branch, he pushed onto it and after sometime I tried to do the same but I got. but I got error saying :</p>
  
  <pre><code>error: failed to push some refs to '&lt;repo_name&gt;'
  hint: Updates were rejected because the remote contains work that you do
  hint: not have locally. This is usually caused by another repository pushing
  hint: to the same ref. You may want to first integrate the remote changes
  hint: (e.g., 'git pull ...') before pushing again.
  hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  </code></pre>
  
  <p>So I did a pull from the remote branch and resolved merge conflicts.</p>
  
  <p>But after that when I tried to push to the remote having included changes from both me and my friend it said :</p>
  
  <pre><code>Everything up-to-date
  </code></pre>
  
  <p>but my changes are still not reflected in the remote repo. What am I missing here ?</p>