Results - Source Code
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
error: Your local changes to the following files would be overwritten by merge:
app/access_controls/access_control_edit.php
app/access_controls/app_config.php
app/access_controls/app_defaults.php
app/access_controls/app_menu.php
app/basic_operator_panel/app_languages.php
app/basic_operator_panel/app_menu.php
app/bridges/app_languages.php
app/bridges/app_menu.php
app/bridges/resources/classes/bridges.php
app/call_block/app_languages.php
app/call_block/app_menu.php
app/call_block/resources/classes/call_block.php
app/call_broadcast/app_languages.php
app/call_broadcast/app_menu.php
app/call_broadcast/resources/classes/call_broadcast.php
app/call_center_active/app_languages.php
app/call_center_active/app_menu.php
app/call_centers/app_languages.php
app/call_centers/app_menu.php
app/call_centers/resources/classes/call_center.php
app/call_flows/app_languages.php
app/call_flows/app_menu.php
app/call_flows/resources/classes/call_flows.php
app/call_forward/app_languages.php
app/call_forward/app_menu.php
app/call_recordings/app_languages.php
app/call_recordings/app_menu.php
app/call_recordings/resources/classes/call_recordings.php
app/calls_active/app_languages.php
app/calls_active/app_menu.php
app/click_to_call/app_languages.php
app/click_to_call/app_menu.php
app/conference_centers/app_languages.php
app/conference_centers/app_menu.php
app/conference_centers/resources/classes/conference_centers.php
app/conference_controls/app_languages.php
app/conference_controls/app_menu.php
app/conference_controls/resources/classes/conference_controls.php
app/conference_profiles/app_languages.php
app/conference_profiles/app_menu.php
app/conference_profiles/resources/classes/conference_profiles.php
app/conferences/app_languages.php
app/conferences/app_menu.php
app/conferences/resources/classes/conferences.php
app/conferences_active/app_languages.php
app/conferences_active/app_menu.php
app/contacts/app_languages.php
app/contacts/app_menu.php
app/contacts/resources/classes/contacts.php
app/database_transactions/app_languages.php
app/database_transactions/app_menu.php
app/destinations/app_languages.php
app/destinations/app_menu.php
app/destinations/resources/classes/destinations.php
app/devices/app_languages.php
app/devices/app_menu.php
app/devices/resources/classes/device.php
app/dialplan_inbound/app_languages.php
app/dialplan_inbound/app_menu.php
app/dialplan_outbound/app_languages.php
app/dialplan_outbound/app_menu.php
app/dialplan_outbound/dialplan_outbound_add.php
app/dialplans/app_languages.php
app/dialplans/app_menu.php
app/dialplans/dialplans.php
app/dialplans/resources/switch/conf/dialplan/015_caller_details.xml
app/dialplans/resources/switch/conf/dialplan/060_redial.xml
app/dialplans/resources/switch/conf/dialplan/200_agent_status.xml
app/dialplans/resources/switch/conf/dialplan/210_agent_status_id.xml
app/dialplans/resources/switch/conf/dialplan/215_agent_status_break.xml
app/dialplans/resources/switch/conf/dialplan/270_call_privacy.xml
app/dialplans/resources/switch/conf/dialplan/280_call_return.xml
app/dialplans/resources/switch/conf/dialplan/300_dx.xml
app/dialplans/resources/switch/conf/dialplan/310_att_xfer.xml
app/dialplans/resources/switch/conf/dialplan/310_send_to_voicemail.xml
app/dialplans/resources/switch/conf/dialplan/320_vmain.xml
app/dialplans/resources/switch/conf/dialplan/320_xfer_vm.xml
app/dialplans/resources/switch/conf/dialplan/330_is_transfer.xml
app/dialplans/resources/switch/conf/dialplan/330_vmain_user.xml
app/dialplans/resources/switch/conf/dialplan/340_cf.xml
app/dialplans/resources/switch/conf/dialplan/340_delay_echo.xml
app/dialplans/resources/switch/conf/dialplan/350_echo.xml
app/dialplans/resources/switch/conf/dialplan/350_please_hold.xml
app/dialplans/resources/switch/conf/dialplan/360_is_zrtp_secure.xml
app/dialplans/resources/switch/conf/dialplan/360_milliwatt.xml
app/dialplans/resources/switch/conf/dialplan/370_is_secure.xml
app/dialplans/resources/switch/conf/dialplan/370_tone_stream.xml
app/dialplans/resources/switch/
Aborting
Updating cd044b35a..a258a067a
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
error: Your local changes to the following files would be overwritten by merge:
app/access_controls/access_control_edit.php
app/access_controls/app_config.php
app/access_controls/app_defaults.php
app/access_controls/app_menu.php
app/basic_operator_panel/app_languages.php
app/basic_operator_panel/app_menu.php
app/bridges/app_languages.php
app/bridges/app_menu.php
app/bridges/resources/classes/bridges.php
app/call_block/app_languages.php
app/call_block/app_menu.php
app/call_block/resources/classes/call_block.php
app/call_broadcast/app_languages.php
app/call_broadcast/app_menu.php
app/call_broadcast/resources/classes/call_broadcast.php
app/call_center_active/app_languages.php
app/call_center_active/app_menu.php
app/call_centers/app_languages.php
app/call_centers/app_menu.php
app/call_centers/resources/classes/call_center.php
app/call_flows/app_languages.php
app/call_flows/app_menu.php
app/call_flows/resources/classes/call_flows.php
app/call_forward/app_languages.php
app/call_forward/app_menu.php
app/call_recordings/app_languages.php
app/call_recordings/app_menu.php
app/call_recordings/resources/classes/call_recordings.php
app/calls_active/app_languages.php
app/calls_active/app_menu.php
app/click_to_call/app_languages.php
app/click_to_call/app_menu.php
app/conference_centers/app_languages.php
app/conference_centers/app_menu.php
app/conference_centers/resources/classes/conference_centers.php
app/conference_controls/app_languages.php
app/conference_controls/app_menu.php
app/conference_controls/resources/classes/conference_controls.php
app/conference_profiles/app_languages.php
app/conference_profiles/app_menu.php
app/conference_profiles/resources/classes/conference_profiles.php
app/conferences/app_languages.php
app/conferences/app_menu.php
app/conferences/resources/classes/conferences.php
app/conferences_active/app_languages.php
app/conferences_active/app_menu.php
app/contacts/app_languages.php
app/contacts/app_menu.php
app/contacts/resources/classes/contacts.php
app/database_transactions/app_languages.php
app/database_transactions/app_menu.php
app/destinations/app_languages.php
app/destinations/app_menu.php
app/destinations/resources/classes/destinations.php
app/devices/app_languages.php
app/devices/app_menu.php
app/devices/resources/classes/device.php
app/dialplan_inbound/app_languages.php
app/dialplan_inbound/app_menu.php
app/dialplan_outbound/app_languages.php
app/dialplan_outbound/app_menu.php
app/dialplan_outbound/dialplan_outbound_add.php
app/dialplans/app_languages.php
app/dialplans/app_menu.php
app/dialplans/dialplans.php
app/dialplans/resources/switch/conf/dialplan/015_caller_details.xml
app/dialplans/resources/switch/conf/dialplan/060_redial.xml
app/dialplans/resources/switch/conf/dialplan/200_agent_status.xml
app/dialplans/resources/switch/conf/dialplan/210_agent_status_id.xml
app/dialplans/resources/switch/conf/dialplan/215_agent_status_break.xml
app/dialplans/resources/switch/conf/dialplan/270_call_privacy.xml
app/dialplans/resources/switch/conf/dialplan/280_call_return.xml
app/dialplans/resources/switch/conf/dialplan/300_dx.xml
app/dialplans/resources/switch/conf/dialplan/310_att_xfer.xml
app/dialplans/resources/switch/conf/dialplan/310_send_to_voicemail.xml
app/dialplans/resources/switch/conf/dialplan/320_vmain.xml
app/dialplans/resources/switch/conf/dialplan/320_xfer_vm.xml
app/dialplans/resources/switch/conf/dialplan/330_is_transfer.xml
app/dialplans/resources/switch/conf/dialplan/330_vmain_user.xml
app/dialplans/resources/switch/conf/dialplan/340_cf.xml
app/dialplans/resources/switch/conf/dialplan/340_delay_echo.xml
app/dialplans/resources/switch/conf/dialplan/350_echo.xml
app/dialplans/resources/switch/conf/dialplan/350_please_hold.xml
app/dialplans/resources/switch/conf/dialplan/360_is_zrtp_secure.xml
app/dialplans/resources/switch/conf/dialplan/360_milliwatt.xml
app/dialplans/resources/switch/conf/dialplan/370_is_secure.xml
app/dialplans/resources/switch/conf/dialplan/370_tone_stream.xml
app/dialplans/resources/switch/
Aborting
Updating cd044b35a..a258a067a