Deprecated function: The each() function is deprecated. This message will be suppressed on further calls in _menu_load_objects() (line 579 of /var/www/drupal-7.x/includes/menu.inc).
Deprecated function: implode(): Passing glue string after array is deprecated. Swap the parameters in drupal_get_feeds() (line 394 of /var/www/drupal-7.x/includes/common.inc).
Published by Matthew Davidson on Wed, 04/11/2015 - 9:38pm
Harsh but fair. http://xkcd.com/1597/ #xkcd #git Personally, I resolve conflicts by using rebase rather than merge, and never working with anybody but myself. YMMV.