[yocto] poky git pull merge failures

[Elvis Dowson]

Hi,
       I just deleted my entire poky folder, cloned again, and I still find a whole bunch of errors, while trying to build core-image-sato.

Someone is just messing up the whole yocto repository, to the point that it's starting to become unreliable just like OpenEmbedded was. When I first started using Yocto for the first few months, updates were reliable, and things would build. But recently, someone's been messing things up so badly. I just hope it isn't the same guy that's been messing up OpenEmbedded, and decided to join the Yocto bandwagon, and continue messing up this build system as well.

ERROR: ParseError at /tool/yocto/meta-openembedded/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb:60: unparsed line: '<<<<<<< HEAD'
ERROR: No recipes available for:
  /tool/yocto/poky/meta-yocto/recipes-core/uclibc/uclibc_git.bbappend
  /tool/yocto/poky/meta-yocto/recipes-kernel/linux/linux-yocto_3.2.bbappend
  /tool/yocto/poky/meta-yocto/recipes-bsp/formfactor/formfactor_0.0.bbappend
  /tool/yocto/poky/meta-yocto/recipes-core/netbase/netbase_5.0.bbappend
  /tool/yocto/poky/meta-yocto/recipes-graphics/mesa/mesa-dri_7.11.bbappend
  /tool/yocto/poky/meta-yocto/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
  /tool/yocto/poky/meta-yocto/recipes-qt/qt4/qt4-x11-free_4.8.1.bbappend
  /tool/yocto/meta-openembedded/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.1.bbappend
  /tool/yocto/poky/meta-yocto/recipes-bsp/alsa-state/alsa-state.bbappend
  /tool/yocto/poky/meta-yocto/recipes-core/psplash/psplash_git.bbappend
  /tool/yocto/poky/meta-yocto/recipes-gnome/tasks/task-core-sdk-gmae.bbappend
  /tool/yocto/poky/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
  /tool/yocto/meta-openembedded/meta-oe/recipes-qt/tasks/task-qte-toolchain-target.bbappend
  /tool/yocto/meta-openembedded/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.1.bbappend
  /tool/yocto/meta-openembedded/meta-oe/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bbappend
  /tool/yocto/poky/meta-yocto/recipes-core/tasks/task-core-tools-profile.bbappend
  /tool/yocto/poky/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
  /tool/yocto/meta-xilinx/recipes-core/initscripts/initscripts_1.0.bbappend
  /tool/yocto/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
  /tool/yocto/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/pixman_0.26.2.bbappend
  /tool/yocto/poky/meta-yocto/recipes-kernel/linux/linux-yocto_3.4.bbappend
  /tool/yocto/poky/meta-yocto/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bbappend
  /tool/yocto/meta-xilinx/recipes-core/util-linux/util-linux_2.21.2.bbappend
  /tool/yocto/poky/meta-yocto/recipes-graphics/mesa/mesa-dri_git.bbappend
  /tool/yocto/poky/meta-yocto/recipes-core/busybox/busybox_1.19.4.bbappend
  /tool/yocto/meta-openembedded/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
  /tool/yocto/meta-openembedded/meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bbappend
ERROR: Command execution failed: Exited with 1

Summary: There were 3 ERROR messages shown, returning a non-zero exit code.


Elvis Dowson