title: SourceTree 1ahead 1behind
body: <p>I have done some changes on develop branch and committed those changes. When I wanted to push, I observed a pull request. When I tried to pull, I am getting the following error</p>
  
  <p>*git -c diff.mnemonicprefix=false -c core.quotepath=false fetch origin
  git -c diff.mnemonicprefix=false -c core.quotepath=false pull --no-commit origin develop</p>
  
  <p>error: You have not concluded your merge (MERGE_HEAD exists).</p>
  
  <p>hint: Please, commit your changes before merging.</p>
  
  <p>fatal: Exiting because of unfinished merge*</p>
  
  <p>When I am trying to push, I am getting the following error</p>
  
  <p>*git -c diff.mnemonicprefix=false -c core.quotepath=false push -v --tags origin develop:develop</p>
  
  <p>Pushing to <a href="https://radcherukuri@bitbucket.org/aerocsaccldev/hubcld-magneticcompass.git" rel="nofollow noreferrer">https://radcherukuri@bitbucket.org/aerocsaccldev/hubcld-magneticcompass.git</a></p>
  
  <p>To <a href="https://radcherukuri@bitbucket.org/aerocsaccldev/hubcld-magneticcompass.git" rel="nofollow noreferrer">https://radcherukuri@bitbucket.org/aerocsaccldev/hubcld-magneticcompass.git</a> = [up to date]      v0.1 -> v0.1</p>
  
  <p>! [rejected]        develop -> develop (non-fast-forward)</p>
  
  <p>error: failed to push some refs to 'radcherukuri@bitbucket.org/aerocsaccldev/hubcld-magneticcompass.git'</p>
  
  <p>hint: Updates were rejected because the tip of your current branch is behind</p>
  
  <p>hint: its remote counterpart. Integrate the remote changes (e.g.
  hint: 'git pull ...') before pushing again.</p>
  
  <p>hint: See the 'Note about fast-forwards' in 'git push --help' for details.*</p>
  
  <p>Can someone help me in resolving this issue?</p>