Skip to content

Never-ending merging status #39

@capehill

Description

@capehill

Sometimes, when fetching changes from remote (sgit fetch origin) and merging them (sgit merge origin/master), repository stays in "merging" state (without conflicts). Any idea how to clear this without re-cloning?

This is slightly annoying because it seems to affect commit history, making it non-linear.

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