Compdigitec Labs

« | Home | »

When git am fails, use 3way

By admin | July 3, 2012

git am 0001-Very-valuable-piece-of-art.patch

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 “git am --resolved”.
If you would prefer to skip this patch, instead run “git am --skip”.
To restore the original branch and stop patching run “git am --abort”.

What to do? --3way to the rescue!

git am --3way

Applying: Very valuable piece of art
Using index info to reconstruct a base tree…
Falling back to patching base and 3-way merge…
Auto-merging Apple.java
Auto-merging Window.java

Smooth.

If you found this article helpful or interesting, please help Compdigitec spread the word. Don’t forget to subscribe to Compdigitec Labs for more useful and interesting articles!

Topics: Linux | No Comments »

Comments