Re: [orca-list] Pulling Orca master fails

[Joanmarie Diggs <jdiggs igalia com>]

Any chance you reverted something locally or committed any other changes
locally? I'm not having the problem myself.

--joanie

On 1/10/19 8:20 AM, Andy Borka via orca-list wrote:
> Hi,
>
>
> I went to pull Orca master this morning to see if there were any
> updates. This is what I ended up with. Is there a way to fix this problem?
>
>
> Documents/Sources/orca$ git pull
> Updating 65086715d..a8748b197
> error: Your local changes to the following files would be overwritten by
> merge:
>     configure.ac
>     help/C/commands_reading.page
>     help/C/commands_where_am_i.page
>     help/sv/sv.po
>     po/es.po
>     po/fr.po
>     po/sl.po
>     po/sv.po
>     src/orca/braille.py
>     src/orca/cmdnames.py
>     src/orca/common_keyboardmap.py
>     src/orca/event_manager.py
>     src/orca/messages.py
>     src/orca/mouse_review.py
>     src/orca/orca_bin.py.in
>     src/orca/orca_gui_navlist.py
>     src/orca/script.py
>     src/orca/script_utilities.py
>     src/orca/scripts/apps/gtk-window-decorator/script.py
>     src/orca/scripts/apps/metacity/script.py
>     src/orca/scripts/apps/soffice/speech_generator.py
>     src/orca/scripts/default.py
>     src/orca/scripts/toolkits/Gecko/script_utilities.py
>     src/orca/scripts/toolkits/Makefile.am
>     src/orca/scripts/toolkits/__init__.py
>     src/orca/scripts/web/script.py
>     src/orca/scripts/web/script_utilities.py
>     src/orca/scripts/web/speech_generator.py
>     src/orca/speech_generator.py
>     src/orca/structural_navigation.py
>     test/html/aria-landmarks.html
>     test/keystrokes/firefox/aria_alert.py
>     test/keystrokes/firefox/aria_alert_dialog.py
>     test/keystrokes/firefox/aria_button_dojo.py
>     test/keystrokes/firefox/aria_checkbox_dojo.py
>     test/keystrokes/firefox/aria_combobox_dojo.py
>     test/keystrokes/firefox/aria_dialog_dismissed.py
>     test/keystrokes/firefox/aria_invalid.py
>     test/keystrokes/firefox/aria_list.py
>     test/keystrokes/firefox/aria_menu.py
>     test/keystrokes/firefox/aria_radiobutton.py
>     test/keystrokes/firefox/aria_slider.py
>     test/keystrokes/firefox/aria_slider_dojo.py
>     test/keystrokes/firefox/aria_slider_tpg.py
>     test/keystrokes/firefox/aria_sliders.py
>     test/keystrokes/firefox/aria_spinner_dojo.py
>     test/keystrokes/firefox/aria_tabpanel.py
>     test/keystrokes/firefox/aria_tabpanel2.py
>     test/keystrokes/firefox/aria_tabpanel_text_dojo.py
>     test/keystrokes/firefox/aria_tree.py
>     test/keystrokes/firefox/aria_tree_dojo.py
>     test/keystrokes/firefox/find_wiki.py
>     test/keystrokes/firefox/flat_review_text_by_line.py
>     test/keystrokes/firefox/flat_review_text_by_word_and_char.py
>     test/keystrokes/firefox/focus_tracking_descriptions.py
>     test/keystrokes/firefox/focus_tracking_input_type_number.py
>     test/keystrokes/firefox/focus_tracking_link_child_of_body.py
>     test/keystrokes/firefox/focus_tracking_links.py
>     test/keystrokes/firefox/focus_tracking_roledescriptions.py
>     test/keystrokes/firefox/html_link_where_am_i.py
>     test/keystrokes/firefox/html_role_combo_box.py
>     test/keystrokes/firefox/html_role_links.py
>     test/keystrokes/firefox/html_role_list_item_where_am_i.py
>     test/keystrokes/firefox/html_struct_nav_activate_link.py
>     test/keystrokes/firefox/html_struct_nav_bug_554616.py
>     test/keystrokes/firefox/html_struct_nav_bug_556470.py
> test/keystrokes/firefox/html_struct_nav_clickable_text_change.py
>     test/keystrokes/firefox/html_struct_nav_containers.py
> test/keystrokes/firefox/html_struct_nav_heading_in_div_with_text.py
> test/keystrokes/firefox/html_struct_nav_headings_with_hidden_anchors.py
> test/keystrokes/firefox/html_struct_nav_link_with_child_text.py
>     test/keystrokes/firefox/html_struct_nav_links.py
>     test/keystrokes/firefox/html_struct_nav_list_item.py
>     test/keystrokes/firefox/html_struct_nav_lists.py
>     test/keystrokes/firefox/line_nav_bug_577239.py
>     test/keystrokes/firefox/line_nav_bug_592383.py
>     test/keystrokes/firefox/line_nav_bugzilla_search_down.py
>     test/keystrokes/firefox/ui_doc_tabs.py
>     test/keystrokes/firefox/ui_role_accel_label.py
>     test/keystrokes/firefox/ui_role_check_menu_item.py
>     test/keystrokes/firefox/ui_role_entry.py
>     test/keystrokes/firefox/ui_role_menu_bar.py
>     test/keystrokes/firefox/ui_role_menu_flat_review.py
>     test/keystrokes/firefox/ui_role_radio_button.py
>     test/keystrokes/firefox/ui_role_radio_menu_item.py
>     test/keystrokes/firefox/ui_role_tree.py
>     test/keystrokes/firefox/ui_role_tree_table.py
>     test/keystrokes/firefox/ui_title_and_status_bar.py
>     test/keystrokes/firefox/word_nav_list_items.py
>     test/keystrokes/gnome-clocks/stop_watch_flat_review.py
>     test/keystrokes/gnome-clocks/timer_flat_review.py
>     test/keystrokes/gnome-terminal/command_not_found.py
>     test/keystrokes/gnome-terminal/man_page.py
>     test/keystrokes/gnome-termi
> Aborting
> ]0;andy@DreamX:
> ~/Documents/Sources/orcaandy@DreamX:~/Documents/Sources/orca$
>
> _______________________________________________
> orca-list mailing list
> orca-list gnome org
> https://mail.gnome.org/mailman/listinfo/orca-list
> Orca wiki: https://wiki.gnome.org/Projects/Orca
> Orca documentation: https://help.gnome.org/users/orca/stable/
> GNOME Universal Access guide:
> https://help.gnome.org/users/gnome-help/stable/a11y.html
> Log bugs and feature requests at http://bugzilla.gnome.org