title: push failed ( merge returned `already up to date ` )
body: <p>I want to fetch and merge the changes that have been done in <code>develop</code> branch into my branch <code>OneUser</code>.</p>
  
  <p>I am doing:</p>
  
  <pre><code>git checkout OneUser
  git fetch origin develop  
  
  ...
  Unpacking objects: 100% (21/21), done.
  From https://github.com/.........
   * branch            develop    -&gt; FETCH_HEAD
     e2f......... d36  develop    -&gt; origin/develop
  
  git merge origin develop
  
  Already up-to-date.
  </code></pre>
  
  <p>git commit -a</p>
  
  <p>(I know that some changes have been done, so normally it should give me some conflicts?Or what it has been changed? )</p>
  
  <p>Then , if I try to push my changes to develop :</p>
  
  <pre><code>git checkout OneUser
  git push -u origin develop
  
   ! [rejected]        develop -&gt; develop (non-fast-forward)
  error: failed to push some refs to 'https://github.com/.../.git
  hint: Updates were rejected because a pushed branch tip is behind its remote
  hint: counterpart. Check out this branch and integrate the remote changes
  hint: (e.g. 'git pull ...') before pushing again.
  </code></pre>
  
  <p>========= Α workflow ========================</p>
  
  <pre><code>git checkout -b OneUser develop
  git branch --set-upstream-to=origin/develop
  
  //fetch from develop branch and merge to OneUser
  git checkout OneUser
  git fetch origin develop
  git merge origin/develop
  
  If you have any conflicts ,solve , add files and commit.
  
  //work on branch
  git add “files”
  git commit -m “message”
  
  //push to develop
  git push origin OneUser:develop
  </code></pre>