19 Dec
2012
19 Dec
'12
7:04 a.m.
On 12/18/2012 06:08 PM, Allen Martin wrote: ...
The other alternative is I could provide the conflict resolved files or instructions for how to resolve.
Aren't the two sets of files that conflict those that are already in u-boot/master and u-boot-arm/master? If so, only Albert can resolve the conflict, by doing a merge. I already did that merge locally a while back in order to pick up the changes from both branches, and it didn't seem hard; what's the problem here? If Allen can push out a branch for Albert to use as an example to make sure he gets the correct merge result, that seems like a very simple solution.