This post shows how to quickly view the changes between your local app and a remote Git repository.
We begin with a Git Fetch.
Here’s the main point of this post demonstrating how we get that snapshot of changes we expect when we merge the fetched updates.
$ git diff --stat master origin/master
Or as shown in an Eclipse Terminal View.
Everything looks good so we’re going to merge the fetched update with our project master branch. D’OH! Looks like we have a merge conflict.
We’ll make the changes to our merge-conflicted file and proceed. It’s interesting to note that we simply Stage and Commit at this point and we’re back to work.