search

jupyterlab / jupyterlab-git

A Git extension for JupyterLab
BSD 3-Clause "New" or "Revised" License
1.44k stars 312 forks source link

Error reversing #729

Open ronigold opened 4 years ago

ronigold commented 4 years ago

Hi, If I want to reverse usually I get the following error message: image If I click on the file to see the changes I get the following screen: image Would appreciate help. image

fcollonval commented 4 years ago

Thanks @ronigold for the feedback. Is it possible for you to run JupyterLab in debug mode (add --debug when launching JupyterLab) and report the error on the server console you see for the revert action?

For the diff error, this is probably a different error. As it seems the diff cannot handle a removed file.

ronigold commented 4 years ago

image image Is it detailed enough?

fcollonval commented 4 years ago

Thanks

Git is actually failing to revert your commit: image

Sorry for the unclear error message.

You could try to run in a terminal the git command:

git revert --no-commit <commitID>

This will show you the full git error. But it will be up to you to fix it as it seems to create conflicts.

fcollonval commented 3 years ago

Since 0.22.x, the error message in such case will be brought to the user:

image

It will result in a repository with conflicts to be solved. As this is complex for git beginners, a workflow of resolution should be designed to handle such case - maybe cancelling the revert and informing the user it is not possible to carry out the desired revert action.