Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Display error message when creating new branch fails due to unmerged files #242

Closed

Description

@kuychaco
➜  repo-merge-conflict-all git:(master) ✗ gco -b new branch
removed-on-master.txt: needs merge
error: you need to resolve your current index first

Activity

  1. simurai commented on Sep 14, 2016

    @simurai
    Contributor

    Just a thought.. there are probably tons of edge cases and errors. Would it make sense to have some kind of "catch all errors and show them as a message".

    • It would free us a bit from solving all these cases that happen sometimes, but are still not too common.
    • People reading those messages probably know what to do (well, if they are familiar using git with the command line).

    Similar to that output at the bottom of the git-control package, but not show it all the time and only when there is something we don't handle.

    68747470733a2f2f7261772e67697468756275736572636f6e74656e742e636f6d2f6a61636f67722f61746f6d2d6769742d636f6e74726f6c2f6d61737465722f73637265656e73686f74732f6769742d30312e706e67

  2. kuychaco commented on Sep 23, 2016

    @kuychaco
    ContributorAuthor

    @simurai yeah sounds reasonable. Currently we are catching errors and for certain ones we are displaying nicer, more readable versions of the error message. For errors that we're not doing this for, we should probably just display whatever git outputs to the command line.

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

Metadata

Metadata

Assignees

No one assigned

    Type

    No type

    Projects

    No projects

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions