title: Cannot push branch because of weird changes in master
body: <p>I work on branch, let name it <code>mybranch</code>. I do not modify <code>master</code>.
  I want to push changes on <code>origin/feature/mybranch</code> but I have some problems. What is strange I've done it before a few times and I didn't have any problems.</p>
  
  <pre><code>$ git branch
  develop
  * feature/mybranch
  master
  
  
  $ git push
  To http://......
  ! [rejected]        master -&gt; master (non-fast-forward)
  error: failed to push some refs to 'http://....'
  hint: Updates were rejected because a pushed branch tip is behind its remote
  hint: counterpart. If you did not intend to push that branch, you may want to
  hint: specify branches to push or set the 'push.default' configuration variable
  hint: to 'simple', 'current' or 'upstream' to push only the current branch.
  </code></pre>
  
  <p>What? Master?! So lets check the <code>master</code>.</p>
  
  <pre><code>$ git checkout master
  Switched to branch 'master'
  Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded.
   (use "git pull" to update your local branch)
  
  
  $ git pull
  Updating 45c7319..f6b8e97
  error: Your local changes to the following files would be overwritten by merge:
      platform/....java
      services/....java
      ...
  
  Please, commit your changes or stash them before you can merge.
  Aborting
  </code></pre>
  
  <p>This shows 7 modified files.</p>
  
  <pre><code>$ git status
  # On branch master
  # Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded.
  
  #   (use "git pull" to update your local branch)
  #
  # Changes not staged for commit:
  #   (use "git add &lt;file&gt;..." to update what will be committed)
  #   (use "git checkout -- &lt;file&gt;..." to discard changes in working directory)
  #
  #       modified:   platform/....java
  #       modified:   algorithms/....java
  #       ...
  #
  # Untracked files:
  #   (use "git add &lt;file&gt;..." to include in what will be committed)
  #
  #       algorithms/.../
  #       and over 1100 files in bin folder. I don't know why gitignore doesn't work now.
  </code></pre>
  
  <p>This shows 17 (not 7 as above) modified files. Weird ... nevermind. These are not my changes, I want to discard them.</p>
  
  <pre><code>$ git checkout -f
  Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded.
    (use "git pull" to update your local branch)
  </code></pre>
  
  <p>And I still have these strange changes in <code>master</code>...</p>