Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add "Checkout" command to commit files #684

Closed
tiansin opened this issue Mar 18, 2019 · 4 comments
Closed

Add "Checkout" command to commit files #684

tiansin opened this issue Mar 18, 2019 · 4 comments
Labels
feature New feature or request

Comments

@tiansin
Copy link

tiansin commented Mar 18, 2019 •
edited

  • GitLens Version: 9.5.1
  • VSCode Version: 1.32.3
  • OS Version: mac 10.13.6
  • Git Version: 2.18.0

Steps to Reproduce:

#574

[2019-03-18 11:15:05:114] git — -c, core.quotepath=false, -c, color.ui=false, apply, --whitespace=warn, -3, cwd='/Users/xxxx/project'

Error: error: patch failed: resources/views/home/index.blade.php:37
Falling back to three-way merge...
error: patch failed: resources/views/home/index.blade.php:37
error: resources/views/home/index.blade.php: patch does not apply

[2019-03-18 11:15:05:383] message
Error: error: patch failed: resources/views/home/index.blade.php:37
Falling back to three-way merge...
error: patch failed: resources/views/home/index.blade.php:37
error: resources/views/home/index.blade.php: patch does not apply
@eamodio
Copy link
Member

eamodio commented Apr 1, 2019

@tiansin why do you think this is because of whitespace conflicts? --whitespace=warn is set which will just report whitespace issues, but not block the apply. It is also falling back to 3-way merge, but is also failing. I'm not sure what I can do here, as git is failing to apply your patch.

@eamodio eamodio added needs-more-info Needs further information, steps, details, etc. type: potential bug labels Apr 1, 2019
@tiansin
Copy link
Author

tiansin commented Apr 1, 2019

Sorry, I always thought that this command was to check out the file and replace the local file content. It may be that I understood it wrong.

@eamodio
Copy link
Member

eamodio commented Apr 17, 2019

It used to at one point but that was really a bug. Although I could add it back as a new Checkout command.

@eamodio eamodio added feature New feature or request and removed needs-more-info Needs further information, steps, details, etc. type: potential bug labels Apr 17, 2019
@eamodio eamodio added this to the Soonish™ milestone Apr 17, 2019
@eamodio eamodio changed the title Apply Changes not working because of whitespace conflicts Add "Checkout" command to commit files Apr 17, 2019
@eamodio eamodio modified the milestones: Soonish™, Soon™ Apr 17, 2019
@eamodio eamodio removed this from the Soon™ milestone Jul 19, 2019
@github-actions
Copy link

github-actions bot commented Dec 1, 2020

This issue has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 1, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
feature New feature or request
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@eamodio @tiansin