Hi Wolfgang,
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! Fetching head... receiving file list ... done .git/refs/heads/.origin-fetching
sent 94 bytes received 144 bytes 158.67 bytes/sec total size is 41 speedup is 0.17 Fetching objects... receiving file list ... done
sent 79 bytes received 47423 bytes 13572.00 bytes/sec total size is 23238354 speedup is 489.21 Fetching tags... receiving file list ... done
sent 81 bytes received 1797 bytes 1252.00 bytes/sec total size is 5002 speedup is 2.66
Applying changes... Merging 0a69b26ed6fe3184cab86872589c27b076e6cb8e -> e6b6d16de73de6a76e2ec4338291e828b860f040 to 50ecf0766fb61883a94c4e703990cb3b5bc1bec1... ... Auto-merging CHANGELOG merge: warning: conflicts during merge ... Auto-merging MAINTAINERS ... Auto-merging MAKEALL ... Auto-merging Makefile ... Auto-merging board/amcc/bamboo/bamboo.c MERGE ERROR: File board/amcc/luan/u-boot.lds added in both branches, but different in each! MERGE ERROR: Conflicting versions saved as 'board/amcc/luan/u-boot.lds~master' and 'board/amcc/luan/u-boot.lds~origin'. ... Auto-merging board/amcc/yellowstone/yellowstone.c ... Auto-merging board/amcc/yosemite/yosemite.c MERGE ERROR: File board/esd/cms700/u-boot.lds removed in one branch but modified in the other! MERGE ERROR: The original version saved as 'board/esd/cms700/u-boot.lds~merge~base', the modified one as 'board/esd/cms700/u-boot.lds~origin'. MERGE ERROR: File board/prodrive/p3p440/u-boot.lds removed in one branch but modified in the other! MERGE ERROR: The original version saved as 'board/prodrive/p3p440/u-boot.lds~merge~base', the modified one as 'board/prodrive/p3p440/u-boot.lds~origin'. ... Auto-merging board/tqm834x/pci.c MERGE ERROR: File board/tqm85xx/u-boot.lds added in both branches, but different in each! MERGE ERROR: Conflicting versions saved as 'board/tqm85xx/u-boot.lds~master' and 'board/tqm85xx/u-boot.lds~origin'. ... Auto-merging cpu/ppc4xx/405gp_pci.c merge: warning: conflicts during merge ... Auto-merging cpu/ppc4xx/cpu.c merge: warning: conflicts during merge ... Auto-merging cpu/ppc4xx/spd_sdram.c ... Auto-merging cpu/ppc4xx/start.S ... Auto-merging include/configs/TQM5200.h ... Auto-merging include/configs/TQM834x.h ... Auto-merging include/configs/bamboo.h ... Auto-merging include/configs/o2dnt.h ... Auto-merging include/ppc440.h
Conflicts during merge. Do cg-commit after resolving them. cg-reset will cancel the merge.
What the following error messages mean?
MERGE ERROR: File board/amcc/luan/u-boot.lds added in both branches, but different in each! MERGE ERROR: Conflicting versions saved as 'board/amcc/luan/u-boot.lds~master' and 'board/amcc/luan/u-boot.lds~origin'.
MERGE ERROR: File board/esd/cms700/u-boot.lds removed in one branch but modified in the other! MERGE ERROR: The original version saved as 'board/esd/cms700/u-boot.lds~merge~base', the modified one as 'board/esd/cms700/u-boot.lds~origin'.
Best regards, llandre
DAVE Electronics System House - R&D Department web: http://www.dave-tech.it email: r&d2@dave-tech.it