Skip to content

Handle merge conflict states #43

Description

@Mauritz8

work was started in e7dcd48.

  • Add tests for the new functionality
  • show a different default commit message when committing after fixing a merge conflict
  • probably more things

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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