Skip to content

Conversation

@kdorichev
Copy link
Contributor

No description provided.

@review-notebook-app
Copy link

Check out this pull request on ReviewNB: https://app.reviewnb.com/fastai/fastai_dev/pull/173

You'll be able to see notebook diffs and discuss changes. Powered by ReviewNB.

@jph00
Copy link
Member

jph00 commented Sep 7, 2019

Sorry @kdorichev there's conflicts in the exported modules. @sgugger this might be an ongoing problem, since the cell numbers change now on each export that adds a cell.

@kdorichev can you re-export (run the last cell of pretty much any notebook) and push again - that should fix the conflict.

@sgugger
Copy link
Contributor

sgugger commented Sep 8, 2019

I may be able to do without the cell numbers and avoid such conflicts. Will work on that on Monday.

@kdorichev
Copy link
Contributor Author

@jph00 Jeremy, re-exported, as you advised. The output of the cells was cleaned.
Yet so many conflicting files. I hope I didn't introduce a mess and am willing to start over from a clean fork.

@jph00
Copy link
Member

jph00 commented Sep 9, 2019

You seem to have removed all outputs - which is not what we want. If you just run tools/run-after-git-clone it should only remove some metadata. Note also that we can't merge anything with conflicts.

I'll close this PR so that you can start fresh, as you suggested. :)

@jph00 jph00 closed this Sep 9, 2019
@kdorichev kdorichev deleted the folders branch September 9, 2019 16:20
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.

3 participants