In message 43B10360.2050704@dave-tech.it you wrote:
I'm working with a local U-Boot repository that periodically is updated with your public one. I encountered the following error when trying to update it:
[llandre@linuxserver u-boot-denx-dave]$ cg-update Recovering from a previously interrupted fetch... WARNING: The rsync access method is DEPRECATED and will be REMOVED in the future!
You may want to pay heed to this warning...
What the following error messages mean?
MERGE ERROR: File board/amcc/luan/u-boot.lds added in both branches, but different in each!
The file board/amcc/luan/u-boot.lds was added in both branches which you are trying to merge, but the versions in both branches are different. You will have to decide which one to use or what else to do.
MERGE ERROR: File board/esd/cms700/u-boot.lds removed in one branch but modified in the other!
The file board/esd/cms700/u-boot.lds was removed in one branch but modified in the other one. You will have to decide if it is to be removed or if the modified version should be used or what else to do.
Ummm.. to me the error messages are pretty clear. What exactly is it what you don't understand?
Best regards,
Wolfgang Denk