Skip to content

merge treats non-conflicted lines as conflicts #6096

@ceedubs

Description

@ceedubs

Describe and demonstrate the bug

Based on https://share.unison-lang.org/@cloud/nimbus/contributions/73/changes I'd expect this merge to only have conflicts on maybe a couple of lines. But in fact it creates ~45 conflict sections.

Side note: why does the Share diff show remote.run when it only includes dependency changes? The Share diff issue was due to a bug that has recently been fixed. But the ucm merge issue still exists.

> clone @cloud/nimbus/@ceedubs/unisonweb-issue-6096
> clone @cloud/nimbus/@ceedubs/less-polite
@cloud/nimbus/@ceedubs/less-polite> merge @cloud/nimbus/@ceedubs/unisonweb-issue-6096

Screenshots
If applicable, add screenshots to help explain your problem.

Environment (please complete the following information):

Metadata

Metadata

Assignees

No one assigned

    Labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions