Skip to content

[Suggestion] Handling git conflicts? #3

@rafauke

Description

@rafauke

Hello,

I've been using your tool for two weeks now, it's very nice <3 I like the simplicity of using a git repository for this. However, there are some issues if there are conflicts between branches. Sometimes the tool can commit conflicts, without checking. Maybe it would be nice to fetch first or do the dry-run, and if pull cannot be made cleanly, suggest to the user that they have to resolve conflicts first? Just an idea! Thanks for a very nice solution for handling this!

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