Skip to content

Consider provide more info for AU/UA conflict #6

@bootleq

Description

@bootleq

The AU (added by us) conflict status may contain unmerged changes on theirs side, but git doesn't get content on :3.
Is it good to provide information that some changes is on theirs side?

Example: checkout bootleq/try-git@3ecc921 (master) and merge bootleq/try-git@2ff6871 ("conflict" branch), and see file Fm.txt.

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