Skip to content

Conflict Resolution #2

@ljcrapo

Description

@ljcrapo

When updating, if unresolved conflicts occur, confirm with the user to use default merge-tool to resolve conflicts or abort the update.

Metadata

Metadata

Assignees

No one assigned

    Labels

    Projects

    No projects

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions