title: git merge Already up to date when it is not
body: <p>While working on a project using git and bitbucket.com, there are the following branches:</p>
  
  <pre><code>master
  development
  uat
  production
  </code></pre>
  
  <p>When I started the project work I took a git clone of development (thinking naturally that it contained the state of the art code). Months of work later, and now it turns out that the code in production branch (which is currently running in production) has a later version than the code I started with in development branch.</p>
  
  <p>When I attempt to:</p>
  
  <pre><code>git checkout development
  git merge production
  </code></pre>
  
  <p>it says "Already up to date". When I go:</p>
  
  <pre><code>git diff production..development
  </code></pre>
  
  <p>it spits out lots of changes that say production branch has code that is not in development branch. How can I make the production code merge with development code without wiping my months of work?</p>