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

Issues with git workflow #73

Closed
okonet opened this issue Oct 10, 2016 · 1 comment
Closed

Issues with git workflow #73

okonet opened this issue Oct 10, 2016 · 1 comment
Labels
Milestone

Comments

@okonet
Copy link
Collaborator

okonet commented Oct 10, 2016

This is valid for #75 and doesn't affect the published version!

Not sure how to reproduce but seems like if there were some stashes before for this file it ends up with

If one of the linters update the file contents then when we execute git stash pop where will be merge conflict for this file. We should execute git stash pop after the commit. I've added a test case here: 80ba161

 ✔ Running tasks for *.js
src/lib/__tests__/parseConfig.spec.js: unmerged (10b204cca737bc26f901456372c503354c43f815)
src/lib/__tests__/parseConfig.spec.js: unmerged (2f3e3c5f14e40ba9dcf6f5418deed76cb3757605)
src/lib/__tests__/parseConfig.spec.js: unmerged (a9ea7e10e0dda3995f214d84a0e72738d2115579)
error: Error building trees
@okonet
Copy link
Collaborator Author

okonet commented Jan 25, 2018

This is now solved in #75

@okonet okonet closed this as completed Jan 25, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

No branches or pull requests

1 participant