title: Differences between 2 branches after merge: GIT
body: <p>I am currently working on a second branch called <code>NC12-changePassword</code>.</p>
  
  <p>There have been changes made to <code>master</code> branch which handle decrypting of a string. I required these new changes to be able to implement a new feature on my branch so I merged the changes.</p>
  
  <p>I did a git pull and there were no conflicts. When I run <code>git log</code> it shows the merge commit. Also when I run <code>git merge master</code> it tells me everything is up to date.</p>
  
  <p>However my code is not working and when I run git <code>diff NC12-changePassword master</code> it lists what's in <code>master</code> that isn't in <code>NC12-changePassword</code>. This doesn't make sense to me because I have merged the changes and therefore the everything that is in master should be in <code>NC12-changePassword</code>.</p>
  
  <p>My understanding is that my branch should function like <code>master</code> and the code should work fine. Or am I missing something :-\ .</p>