Text conflict in debian/control
Text conflict in tests/autopilot/unity8/dash.py
Text conflict in tests/autopilot/unity8/process_helpers.py
Conflict: can't delete tests/autopilot/unity8/shell/emulators because it is not empty. Not deleting.
Conflict because tests/autopilot/unity8/shell/emulators is not versioned, but has versioned children. Versioned directory.
Contents conflict in tests/autopilot/unity8/shell/emulators/main_window.py
Text conflict in tests/autopilot/unity8/shell/tests/test_helpers.py
7 conflicts encountered.
Text conflict in debian/control /unity8/ dash.py /unity8/ process_ helpers. py /unity8/ shell/emulators because it is not empty. Not deleting. /unity8/ shell/emulators is not versioned, but has versioned children. Versioned directory. /unity8/ shell/emulators /main_window. py /unity8/ shell/tests/ test_helpers. py
Text conflict in tests/autopilot
Text conflict in tests/autopilot
Conflict: can't delete tests/autopilot
Conflict because tests/autopilot
Contents conflict in tests/autopilot
Text conflict in tests/autopilot
7 conflicts encountered.