{"id":296,"date":"2012-07-03T17:59:58","date_gmt":"2012-07-03T22:59:58","guid":{"rendered":"http:\/\/www.compdigitec.com\/labs\/?p=296"},"modified":"2012-07-03T17:59:59","modified_gmt":"2012-07-03T22:59:59","slug":"when-git-am-fails-use-3way","status":"publish","type":"post","link":"http:\/\/www.compdigitec.com\/labs\/2012\/07\/03\/when-git-am-fails-use-3way\/","title":{"rendered":"When git am fails, use 3way"},"content":{"rendered":"<pre class=\"brush: bash; title: ; notranslate\" title=\"\">git am 0001-Very-valuable-piece-of-art.patch<\/pre>\n<p>Applying: Very valuable piece of art<br \/>\nerror: patch failed: Apple.java:212<br \/>\nerror: Apple.java: patch does not apply<br \/>\nerror: patch failed: Window.java:840<br \/>\nerror: Window.java: patch does not apply<br \/>\nPatch failed at 0001 Very valuable piece of art<br \/>\nWhen you have resolved this problem run &#8220;git am &#8211;resolved&#8221;.<br \/>\nIf you would prefer to skip this patch, instead run &#8220;git am &#8211;skip&#8221;.<br \/>\nTo restore the original branch and stop patching run &#8220;git am &#8211;abort&#8221;.<\/p>\n<p>What to do? <strong>&#8211;3way<\/strong> to the rescue!<\/p>\n<pre class=\"brush: bash; title: ; notranslate\" title=\"\">git am --3way<\/pre>\n<p>Applying: Very valuable piece of art<br \/>\nUsing index info to reconstruct a base tree&#8230;<br \/>\nFalling back to patching base and 3-way merge&#8230;<br \/>\nAuto-merging Apple.java<br \/>\nAuto-merging Window.java<\/p>\n<p>Smooth.<\/p>","protected":false},"excerpt":{"rendered":"<p>Applying: Very valuable piece of art error: patch failed: Apple.java:212 error: Apple.java: patch does not apply error: patch failed: Window.java:840 error: Window.java: patch does not apply Patch failed at 0001 Very valuable piece of art When you have resolved this problem run &#8220;git am &#8211;resolved&#8221;. If you would prefer to skip this patch, instead run [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[3],"tags":[801,802,800,771,799,803],"_links":{"self":[{"href":"http:\/\/www.compdigitec.com\/labs\/wp-json\/wp\/v2\/posts\/296"}],"collection":[{"href":"http:\/\/www.compdigitec.com\/labs\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/www.compdigitec.com\/labs\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/www.compdigitec.com\/labs\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/www.compdigitec.com\/labs\/wp-json\/wp\/v2\/comments?post=296"}],"version-history":[{"count":0,"href":"http:\/\/www.compdigitec.com\/labs\/wp-json\/wp\/v2\/posts\/296\/revisions"}],"wp:attachment":[{"href":"http:\/\/www.compdigitec.com\/labs\/wp-json\/wp\/v2\/media?parent=296"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/www.compdigitec.com\/labs\/wp-json\/wp\/v2\/categories?post=296"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/www.compdigitec.com\/labs\/wp-json\/wp\/v2\/tags?post=296"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}