-
Notifications
You must be signed in to change notification settings - Fork 84
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
Reset deleted files fails when file is deleted from remote and local directory prior to running gitpuller #234
Comments
Thank you for opening your first issue in this project! Engagement like this is essential for open source projects! 🤗 |
I think may be running into a similar issue. I had a file in the repo (some_csv.csv) and I no longer wanted it there. I deleted it on my JupyterHub server, then I used Even more oddly (at least to me) this error occurred not only when hitting a link for the folder that file was deleted from, but other folders of that same repo as well. |
I can confirm that having deleted this file on the Jupyter server was causing this problem (including pulling sibling directories). I used git locally on the laptop to restore the file
and then uploaded that file into its former location in Jupyter. I was then able to get the nbgitpuller links to work again. |
Tests the situation in this issue: jupyterhub#234
Fixes issues jupyterhub#254 and jupyterhub#234. When a deleted file is reset, this checks it out from the local copy of the branch, rather than from the remote copy. The file might not exist in the remote branch anymore, causing jupyterhub#234 when running `git checkout`. If the file was conflicted before, we will run into issue jupyterhub#254. If the remote file has changed, it will be merged regularly afterwards.
Bug description
When a file is deleted from both the git remote and the local directory, nbgitpuller cannot run successfully.
Expected behaviour
nbgitpuller should ignore files deleted locally if they've also been deleted from the remote.
Actual behaviour
How to reproduce
Your personal set up
Full environment
The text was updated successfully, but these errors were encountered: