Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add error for local changes overwritten #271

Merged
merged 5 commits into from
Jan 29, 2019
Merged

Conversation

mathieudutour
Copy link
Contributor

No description provided.

@shiftkey
Copy link
Member

@mathieudutour thanks for the PR! I thought there was a problem on our end but it turns out that the new test introduces a linting issue:

$ npm run is-it-pretty

> dugite@1.81.0 is-it-pretty /Users/shiftkey/src/dugite
> prettier --check "{examples,lib,script,test}/**/*.ts"

Checking formatting...
test/fast/git-process-test.ts
Code style issues found in the above file(s). Forgot to run Prettier?
npm ERR! code ELIFECYCLE
npm ERR! errno 1
npm ERR! dugite@1.81.0 is-it-pretty: `prettier --check "{examples,lib,script,test}/**/*.ts"`
npm ERR! Exit status 1
npm ERR!
npm ERR! Failed at the dugite@1.81.0 is-it-pretty script.
npm ERR! This is probably not a problem with npm. There is likely additional logging output above.

npm ERR! A complete log of this run can be found in:
npm ERR!     /Users/shiftkey/.npm/_logs/2019-01-28T22_42_25_147Z-debug.log

Running npm run prettify will tidy this up.

@mathieudutour
Copy link
Contributor Author

mathieudutour commented Jan 28, 2019

Fixed! If I have time I might send a PR to desktop/desktop to use this new error and show an actionable popup when it's happening (maybe stash/discard/cancel)

@shiftkey
Copy link
Member

@mathieudutour thanks! I'll see if I can publish a new release to NPM in the meantime to unblock you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants