Skip to content

Can conflict markers indicate what revision each version originates from? #1176

@dbarnett

Description

@dbarnett

When you have a conflict and materialize the conflict markers into the working copy, can the markers give some hint of origin for each version of the changes like revision IDs?

For instance the conflicts in a file will look like

<<<<<<<
%%%%%%%
some version
+++++++
other version
>>>>>>>

but without context on where these versions originated from, it can be hard to figure out how to resolve the changes. Could there be any kind of hint IDs/descriptions maybe after the markers on the same line to give context?

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