Skip to content

FR: merge-tools cannot express "this file should be deleted" #8904

@9999years

Description

@9999years

Is your feature request related to a problem? Please describe.
I'd like to use a merge tool to resolve conflicts caused by files being renamed upstream. The resolution I want is "the conflicted file doesn't exist anymore, so we'll delete it entirely". The merge-tools feature doesn't seem able to express this; leaving the output file empty is interpreted as an error:

Error: Failed to resolve conflicts
Caused by: The output file is either unchanged or empty after the editor quit (run with --debug to see the exact invocation).

Describe the solution you'd like
Some sort of API to indicate that the file should be deleted.

Additional context
This sort of conflict (a rename upstream) is tricky to resolve with the current API. Perhaps we could pass the merge tool a blank output directory and instruct it to make edits there, and apply all of those? But that might cause conflicts with other changed files. There's an intersection with #47 more broadly here.

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