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

[Albert ARIBAUD]

Le 05/12/2010 20:14, Reinhard Meyer a écrit :

> Sorry, the branch name might be a misnomer. As soon as I got two other
> patches applied,
> I'll issue a pull request.

You mean your /next branch will be merged to your /master and you'll 
request a pull of /master ?

> How do I resolve this? When there is a problem with git-rebase I get the
> offending
> files merged with the conflicting parts between <<<,===,>>>
> respectively. Easy to
> edit that. But with git-am I don't seem to get such an option?

Add  --reject to your git am command. It will produce a .rej fil which 
contains the rejected hunks for each failed patch.

> Best Regards,
> Reinhard

Amicalement,
-- 
Albert.