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 | 5 Comments »

5 Responses to “When git am fails, use 3way”

  1. must have android apps Says:
    August 25th, 2021 at 18:14

    … [Trackback]

    […] Information to that Topic: compdigitec.com/labs/2012/07/03/when-git-am-fails-use-3way/ […]

  2. prevent screenshot Says:
    November 16th, 2021 at 18:47

    … [Trackback]

    […] Read More Information here on that Topic: compdigitec.com/labs/2012/07/03/when-git-am-fails-use-3way/ […]

  3. kardinal stick Says:
    November 19th, 2021 at 20:39

    … [Trackback]

    […] Here you will find 5294 additional Information on that Topic: compdigitec.com/labs/2012/07/03/when-git-am-fails-use-3way/ […]

  4. wow slot Says:
    January 10th, 2022 at 19:17

    … [Trackback]

    […] Find More Info here on that Topic: compdigitec.com/labs/2012/07/03/when-git-am-fails-use-3way/ […]

  5. สล็อตวอเลท ไม่มีขั้นต่ำ Says:
    January 24th, 2022 at 19:27

    … [Trackback]

    […] Information on that Topic: compdigitec.com/labs/2012/07/03/when-git-am-fails-use-3way/ […]

Comments