Skip to content

Change ADD_BACK_TO_HEAD conflict to generate delete patch #84

Open
@pazembrz

Description

@pazembrz

When UPDATE removes something from HEAD json_merger generates ADD_BACK_TO_HEAD conflict. Now it's just interpreted as it is so in merged value is absent and in patch we have an add of HEAD value, but we want it to work in opposite way. So in merged we should have value from HEAD and patch should be a delete.

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions