Your comments

Additionally, if you want to edit the changes as you bring them in from another branch then choose "Compare with Working Tree..." from the right-click menu and then "Compare After" from the dialog.