title: Semi-reverting to master and checking changes
body: <p>Is there a good way to easily check how my current project differs from the master branch?  I'd like to somehow pull the master and 'resolve conflicts' again to double check the changes I've made.</p>
  
  <p>I'm working on a side-project off a master - my project never gets merged to master but master gets developed on it's own.  I have an awkward bug now and I'd like to go through all the changes I've made to see where it is.  I have no idea if it's something I've done or some kind of core change made on master.  I don't want to undo all of my changes though, so I'm hoping there's a way to find this similar to how I describe above.</p>
  
  <p>Edit:  I should probably note that 99% of the stuff I've done are in separate files that won't merge conflict - so it's not as simple as just going through the version changes I've made.  I need to find that 1% of code that ties my code into the main project itself.</p>