[U-Boot] merge conflicts during git pull

[Andre Schwarz]

Wolfgang,


....
>> Have I missed anything ?
>> Is there a way to get automagically merged whatever there might be to
>> merge ?
> Sorry, I have no idea what happenend of your system.  I can see no
> issues on our side.

thank - will clone a new repo an pull in my local branches.



-- 

Regards,
Andre



MATRIX VISION GmbH, Talstrasse 16, DE-71570 Oppenweiler
Registergericht: Amtsgericht Stuttgart, HRB 271090
Geschaeftsfuehrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner