-
Notifications
You must be signed in to change notification settings - Fork 104
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
fuse error #231
Comments
try doing If that doesn't work, you can (1) copy the files you resolved outside of the repo so that you don't loose the changes you've made and (2) abort the fuse, which will put you back to the state in which you were before you started the fuse. Then you can use Let me know if you managed to resolve the issue or if you have any other questions. |
Using `git rm <file>` and `git mv <file>` update the index so it's a no-op in this case Fixes #17 Fixes gitless-vcs/gitless#231 Fixes gitless-vcs/gitless#153 Fixes gitless-vcs/gitless#63
I'm trying to use fuse to bring the baseline of my PR branch up to date with HEAD of master.
And I get this error...
I can see that the file it's complaining about 'Source/SomeDirectory/AssemblyInfo.cs' has been deleted as part of the latest commit on the PR branch.
Is there a workaround I can use with just git commands to complete the fuse?
The text was updated successfully, but these errors were encountered: