In message <[EMAIL PROTECTED]> you wrote:
>
> While I do not know how Wolfgang is applying patches,
> I might inject that adding a "-3" flag to a "git am"
I normally use
git-am -3 -i -u --whitespace=strip
> command might help as it will figure out some of these
> more complicated merges slightly better sometimes.
ACK.
> (Wolfgang might already have done that and it still
> failed with conflicts, of course; I just don't know.)
As mentioned bfore, I pulled in a lot of other changes first that
might have caused the conflicts.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
I have made mistakes, but have never made the mistake of claiming I
never made one. - James G. Bennet
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
