Reply to thread

Message

<blockquote data-quote="regeszter" data-source="post: 1167584" data-attributes="member: 15874">git.exe am --3way --ignore-space-change --keep-cr &quot;Z:\R\262242_0001-Fork-Reload-TVHome-settings-when-going-outside-TvRec.patch&quot;Applying: Fork : Reload TVHome settings when going outside TvRecorded to avoid to keep protected item visible.Repository lacks necessary blobs to fall back on 3-way merge.Cannot fall back to three-way merge.Patch failed at 0001 Fork : Reload TVHome settings when going outside TvRecorded to avoid to keep protected item visible.The copy of the patch that failed is found in:&nbsp; c:/mp/MediaPortal-1/.git/rebase-apply/patchWhen you have resolved this problem, run &quot;git am --continue&quot;.If you prefer to skip this patch, run &quot;git am --skip&quot; instead.To restore the original branch and stop patching, run &quot;git am --abort&quot;.fatal: sha1 information is lacking or useless (TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvRecorded.cs).Fail</blockquote>

[QUOTE="regeszter, post: 1167584, member: 15874"] git.exe am --3way --ignore-space-change --keep-cr "Z:\R\262242_0001-Fork-Reload-TVHome-settings-when-going-outside-TvRec.patch" Applying: Fork : Reload TVHome settings when going outside TvRecorded to avoid to keep protected item visible. Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Fork : Reload TVHome settings when going outside TvRecorded to avoid to keep protected item visible. The copy of the patch that failed is found in: c:/mp/MediaPortal-1/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". fatal: sha1 information is lacking or useless (TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvRecorded.cs). Fail [/QUOTE]

Verification