gistfile1.txt

ubuntu:~/apci/www (remove_duplicate_emails_on_siblings)$ git pull mainline newmaster
From github.com:AllPlayers/allplayers-mainline
 * branch            newmaster  -> FETCH_HEAD
Auto-merging www/sites/all/modules/apci_features/apci_public_api_services/resources/user_resource.inc
CONFLICT (content): Merge conflict in www/sites/all/modules/apci_features/apci_public_api_services/resources/user_resource.inc
Automatic merge failed; fix conflicts and then commit the result.
ubuntu:~/apci/www (remove_duplicate_emails_on_siblings|MERGING)$ git status
# On branch remove_duplicate_emails_on_siblings
# Changes to be committed:
#
#	modified:   ../.gitmodules
#	modified:   ../README.md
#	modified:   ../apci.make
#	modified:   ../bin/drush
#	modified:   sites/all/libraries/AllPlayers/Store/Client.php
#	new file:   sites/all/modules/allplayers/apci_store/apci_store.install
#	modified:   sites/all/modules/allplayers/apci_store/apci_store.module
#	modified:   sites/all/modules/allplayers/og_registration/og_registration.forms.inc
#	modified:   sites/all/modules/allplayers/og_registration/og_registration.module
#	modified:   sites/all/modules/apci_features/apci_admin_lite_feature/apci_admin_lite_feature.info
#	modified:   sites/all/modules/apci_features/apci_admin_lite_feature/apci_admin_lite_feature.views_default.inc
#	modified:   sites/all/modules/apci_features/apci_profile_feature/apci_profile_feature.module
#	modified:   sites/all/modules/apci_features/apci_public_api_services/apci_public_api_services.views_default.inc
#	modified:   sites/all/modules/apci_features/apci_public_api_services/lib/RESTClient.php
#	modified:   sites/all/modules/apci_features/apci_public_api_services/lib/Request-bcm.php
#	modified:   sites/all/modules/apci_features/apci_public_api_services/lib/apcirest.php
#	modified:   sites/all/modules/apci_features/apci_public_api_services/resources/groups_resource.inc
#	modified:   sites/all/modules/apci_features/spaces_og_registration/spaces_og_registration.module
#	new file:   sites/all/modules/contrib/ubercart/1312574-fix-checkout-fatal-2.patch
#	modified:   sites/all/modules/contrib/ubercart/payment/uc_credit/uc_credit.module
#	modified:   sites/all/modules/custom/services_docs/resources/rest_wadl_doc.inc
#	modified:   sites/default/default_env_settings.php
#	modified:   sites/default/global_app_settings.php
#	modified:   sites/default/settings.php
#
# Unmerged paths:
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#	both modified:      sites/all/modules/apci_features/apci_public_api_services/resources/user_resource.inc
#
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   ../bin/drush
#