[U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation

[Reinhard Meyer]

Dear Wolfgang Denk,
> In message<4CFC0966.4010303 at emk-elektronik.de>  you wrote:
>>
>> What's possible in git-rebase should be possible in git-am, too.
>
> git-rebase will also show merge conflicts in such cases.
I'm not not what you are trying to say here, since I stated that
I wished git-am would behave the same way as git-rebase.

Anyway, I solved the problem:

git-am -3 <patch>
when this fails, do
git-am -3 --skip
edit the unmerged files
add them
git-am -3 --resolved
and all is fine.

Best Regards,
Reinhard