improve error dialogs #619
Conversation
Emphasized the filenames in these dialogs to make it more immediately obvious what files have conflicts/are being discarded.
if a name wasn't entered or an invalid branch name was entered then the new branch dialog would close once you hit new branch. This makes it so the create branch button is disabled when no name has been entered, and keeps the dialog open until it is clear that branch creation was successful. I also removed the 'fatal' from the git error message as it was redundant with the title of the dialog.
ianhi
changed the title
|
The new commit makes it so that the New Branch Dialog doesn't close too early. There were two things happening:
I did three things:
Resulting in: |
|
A failed git pull/push could also be improved: could offer a button in the dialog to run the Unlike pull this is an edited version of the error text that git generates. Would be nice to prompt that a remote needs to be added. |
There was a problem hiding this comment.
LGTM thanks @ianhi
I modified the style for disabling the create branch button to fit the one of the commit button
|
@meeseeksdev backport to 0.11.x |
…on-0.11.x Backport PR #619 on branch 0.11.x (improve error dialogs)
close: #617
I added styling to the Discard dialog and the switching branch error dialog to make the filenames more visually distinct from the rest of the text. I also modified the text of a git checkout error to something that is hopefully clearer to beginners. In particular I followed the convention already used of saying "switch" instead of "checkout" and I added discarding the changes as an option for resolving the conflict.
New:
Old:
