eliminate eclipse warnings
prompt for save before view diff
return after showing remote branch error
Merge remote-tracking branch: upstream/master