merging {{ report.source_package }} in {{ report.target }}: {{ report.result }}

This package could not be merged: an automated 3-way merge detected conflicts (different changes made to the same file). Please carry out a manual merge and commit the result.

This package could not be merged: {%- if report.message %} {{ report.message }}. {% else %} no reason was specified. {% endif %} Please carry out a manual merge and commit the result.

This package was merged automatically and it seems to have worked. Please check that the result makes sense.

You should compare the patches between package versions and ensure that there are no unexpected changes. You should also sanity-check the resulting source package.

None of the packages' common ancestors could be found in the package pool. This package cannot be merged until you import one.

The version in the source distribution supersedes our version. Please check that it's OK to update to the newer version.

Once you have a source package you are happy to upload, you should make sure you include the orig.tar.gz if appropriate, and information about all the versions included in the merge.

Merge details

Our version in {% if report.obs_project %} {{ report.obs_project }} {% else %} {{ report.left_distro }}:{{ report.left_suite }}:{{ report.left_component }} {% endif %}

{{ report.left_version }} {% if report.left_patch %}
(patch from base version to our version) {% endif %} {% if report.proposed_patch %}
(patch from our version to the proposed version) {% endif %}

Newest common ancestor

{% if report.base_version %} {{ report.base_version }} {% else %} none {% endif %}

Their version in {{ report.right_distro }}:{{ report.right_suite }}:{{ report.right_component }}

{{ report.right_version }} {% if report.right_patch %}
(patch from base version to their version) {% endif %} {% if report.merged_patch %}
(patch from their version to the proposed version) {% endif %}

Committed to OBS

submit request

{{ report.committed_to }}/{{ report.obs_package }}

A commit to OBS was attempted, but it appears to have failed: {{ report.commit_detail }} The merge-our-misc log file might have more details.

Not committed to OBS.

Proposed source package

{{ x }}

Failed merge tarball

Full merge report in JSON format

REPORT.json

Finding a common ancestor

{% if report.result == "NO_BASE" %}

The most recent common ancestor was {{ report.bases_not_found[0] }}.

{% else %} {# !NO_BASE #}

The packages' most recent common ancestor {{ report.bases_not_found[0] }} could not be found. This merge was based on an older common ancestor, but you might get a better-quality automatic merge if you import this version into the package pool.

{% endif %} {# !NO_BASE #}

If that version was in Debian or Ubuntu, you might be able to get it from snapshot.debian.org or Launchpad.

See the "bases_not_found" list in the detailed JSON report for some older versions that might also work.

Download the source package with dget(1) or similar, and put it in {{ report.right_pool_dir }} before the next merge-our-misc run.

Our changelog

{% if report.result == "NO_BASE" %}

Our latest changelog entry:

{% else %}

Our changelog entries since most recent common ancestor:

{% endif %}

{{ left_changelog_text }}

Their changelog

{% if report.result == "NO_BASE" %}

Their latest changelog entry:

{% else %}

Their changelog entries since most recent common ancestor:

{% endif %}

{{ right_changelog_text }}