I’m not sure if anyone has had this. search didn’t find it. My fork of fastbook isn’t letting me update from upstream master.
If I git pull - I’m uptodate, If I git diff, there is no difference, If I git stash and/or git reset --hard it doesn’t say there is a problem - but stays in the same state,
but git pull upstream master says it would overwrite local changes.
I presume this is the nbdev tools having an effect, as they’re installed and nbdev_install_git_hooks ran. I installed via git clone and pip install -e if that matters
anyone able to help?
The only workaround I’ve found - deleting the notebooks then upstream pull works
>
>
> (fastai2) C:\Users\Brad\fastbook>git pull upstream master
> From github.com:fastai/fastbook
> * branch master -> FETCH_HEAD
> Updating ee85ecc..e477ef2
> error: Your local changes to the following files would be overwritten by merge:
> 01_intro.ipynb
> 02_production.ipynb
> Please commit your changes or stash them before you merge.
> Aborting
>
> (fastai2) C:\Users\Brad\fastbook>git reset --hard
> HEAD is now at ee85ecc settings
>
> (fastai2) C:\Users\Brad\fastbook>git pull upstream master
> From github.com:fastai/fastbook
> * branch master -> FETCH_HEAD
> Updating ee85ecc..e477ef2
> error: Your local changes to the following files would be overwritten by merge:
> 01_intro.ipynb
> 02_production.ipynb
> Please commit your changes or stash them before you merge.
> Aborting
>
> (fastai2) C:\Users\Brad\fastbook>git diff
>
> (fastai2) C:\Users\Brad\fastbook>git status
> Refresh index: 100% (206/206), done.
> On branch master
> Your branch is up to date with 'origin/master'.
>
> Changes not staged for commit:
> (use "git add <file>..." to update what will be committed)
> (use "git restore <file>..." to discard changes in working directory)
> modified: 01_intro.ipynb
> modified: 02_production.ipynb