title: git flow branches have diverged
body: <p>I'm using the git flow tools and I've gotten myself in a bit of problem. My git branches have diverged. I've read <a href="https://stackoverflow.com/questions/2452226/master-branch-and-origin-master-have-diverged-how-to-undiverge-branches">master branch and &#39;origin/master&#39; have diverged, how to &#39;undiverge&#39; branches&#39;?</a> and have tried to follow the steps, both attempting to merge and to rebase my local repository.</p>
  
  <pre><code>    $  git flow feature finish showFindLogs
      Branches 'develop' and 'origin/develop' have diverged.
      And branch 'develop' may be fast-forwarded.
      $  git merge origin/develop
      Already up-to-date.
      $ git rebase origin/develop
      Current branch feature/showFindLogs is up to date.
      $ git status
      # On branch feature/showFindLogs
      nothing to commit (working directory clean)
  </code></pre>
  
  <p>How can I get out of this? I'm done with the git flow feature and I'd just like to get my changes up to the remote. Thanks!</p>