-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Closed
Description
- GitLens Version: 9.5.1
- VSCode Version: 1.32.3
- OS Version: mac 10.13.6
- Git Version: 2.18.0
Steps to Reproduce:
[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
Metadata
Metadata
Assignees
Labels
No labels