title: Unable to finish a Git Rebase
body: <p>I am currently working on a branch and want to update it with master. So I tried doing a rebase.</p>
  
  <p>current branch that I am workin on : crtdev</p>
  
  <p>I tried doing rebase like,</p>
  
  <pre><code>git checkout crtdev
  git rebase master
  // used diff mergetool to solve merge issues
  git rebase --continue
  </code></pre>
  
  <p>Now is says, Applying: "all commit messages that I have done in that branch" </p>
  
  <p>But after that what needs to be done?</p>
  
  <p>I checked the repo and there are no changes and when I said <code>git status</code>, I see merged files appearing with filename.html.orig</p>
  
  <p><strong>-- edit</strong>
  When I run a <code>git rebase --continue</code> I get this message <strong>No rebase in progress?</strong> </p>
  
  <p>By running <code>Git status</code> I see this message</p>
  
  <pre><code># On branch crtdev
  # Your branch and 'origin/crtdev' have diverged,
  # and have 33 and 8 different commits each, respectively.
  #   (use "git pull" to merge the remote branch into yours)
  </code></pre>
  
  <p>To complete the rebase, what needs to be done? </p>