title: Merge conflict - No rebase in progress? Why am I on master?
body: <p>I am in the middle of a confusing merge conflict between my branch (fix/disambiguate-property-meaning) and another repo's staging branch that would like to merge in my updated pull request. At present, I find myself on some master branch awaiting its initial commit, but I want to switch to my branch so I can commit to it, which I believe should automatically update the pull request.</p>
  
  <p>This is what I have done so far in my attempt to resolve the merge conflict:    </p>
  
  <pre><code>On branch fix/disambiguate-property-meaning
  Your branch is up-to-date with 'origin/fix/disambiguate-property-meaning'.
  </code></pre>
  
  <p><code>...</code><br>
  <code>git pull --rebase upstream staging</code>    </p>
  
  <p>Resulted in the following messages:  </p>
  
  <pre><code> From https://github.com/FreeCodeCamp/FreeCodeCamp  
   * branch            staging    -&gt; FETCH_HEAD
     57bb224..25e6d42  staging    -&gt; upstream/staging
  ...
  CONFLICT (content): Merge conflict in seed/challenges/01-front-end-development-certification/basic-javascript.json  
  error: Failed to merge in the changes.  
  Patch failed at 0001 fix/disambiguate-property-meaning, make JSON valid in basic-javascript.json #9096  
  The copy of the patch that failed is found in: .git/rebase-apply/patch  
  
  When you have resolved this problem, run "git rebase --continue".  
  ...
  </code></pre>
  
  <p>Before proceeding with editing my file that contained the conflicts, I ran git branch to reassure myself which branches I was dealing with and received:<br>
  <code>* (no branch, rebasing fix/disambiguate-property-meaning) 
     fix/disambiguate-property-meaning 
     staging</code>  </p>
  
  <p>This branch situation looked fine to me. (Did I miss something?) So, in basic-javascript.json, I deleted the git markings that indicated the conflicts. Everything else about my file looked exactly how I need it to look. I saved and closed it.</p>
  
  <p>Back in my terminal, I ran:  </p>
  
  <pre><code>git add basic-javascript.json    
  git rebase --continue    
  </code></pre>
  
  <p>I received the following baffling question:<br>
  <code>No rebase in progress?</code>   </p>
  
  <p>I have not found a clear explanation about this. What is this question really asking me to do? If it is a confirmation that the rebase was successful, as some answers seem to suggest, what a miserable choice in wording it! </p>
  
  <p>What I want to do next is commit basic-javascript.json to <em>my branch,</em> then (automatically) update the pull request; which I believe equates to saying, then merge those changes from <em>my branch</em> to the remote upstream's <em>staging branch.</em> </p>
  
  <p>How do I accomplish that? I am now somehow on some repo's master branch. </p>