arning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: code example

To fix this go to
http://github.com/settings/emails

and unmark the box: Keep my email addresses private