Skip to content

When reordering two commits, you get to resolve the same conflict twice #132

@anordal

Description

@anordal

When two commits touch the same line, and you reorder them, you obviously get a conflict. But you get to resolve it twice, one for the first and one for the other.

I don't think the second conflict is interesting, because the correct state after both commits is already known. It would be convenient to just not be asked about that one.

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions