Error

Despite the commit I'm cherry picking not touching the 3rdparty dir at all, I get this merge issue:

On branch master
Your branch is up-to-date with 'origin/master'.
You are currently cherry-picking commit 6c7143d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	new file:   configs/config.wolf
	new file:   payloads/libpayload/configs/config.wolf
	new file:   src/mainboard/google/wolf/Elpida_EDJ4216EFBG.spd.hex
	new file:   src/mainboard/google/wolf/Hynix_HMT425S6AFR6A.spd.hex
	new file:   src/mainboard/google/wolf/Kconfig
	new file:   src/mainboard/google/wolf/Makefile.inc
	new file:   src/mainboard/google/wolf/Micron_4KTF25664HZ.spd.hex
	new file:   src/mainboard/google/wolf/acpi/chromeos.asl
	new file:   src/mainboard/google/wolf/acpi/ec.asl
	new file:   src/mainboard/google/wolf/acpi/haswell_pci_irqs.asl
	new file:   src/mainboard/google/wolf/acpi/mainboard.asl
	new file:   src/mainboard/google/wolf/acpi/platform.asl
	new file:   src/mainboard/google/wolf/acpi/superio.asl
	new file:   src/mainboard/google/wolf/acpi/thermal.asl
	new file:   src/mainboard/google/wolf/acpi/video.asl
	new file:   src/mainboard/google/wolf/acpi_tables.c
	new file:   src/mainboard/google/wolf/chromeos.c
	new file:   src/mainboard/google/wolf/cmos.layout
	new file:   src/mainboard/google/wolf/devicetree.cb
	new file:   src/mainboard/google/wolf/dsdt.asl
	new file:   src/mainboard/google/wolf/ec.c
	new file:   src/mainboard/google/wolf/ec.h
	new file:   src/mainboard/google/wolf/fadt.c
	new file:   src/mainboard/google/wolf/gpio.h
	new file:   src/mainboard/google/wolf/hda_verb.h
	new file:   src/mainboard/google/wolf/mainboard.c
	new file:   src/mainboard/google/wolf/onboard.h
	new file:   src/mainboard/google/wolf/romstage.c
	new file:   src/mainboard/google/wolf/smihandler.c
	new file:   src/mainboard/google/wolf/thermal.h

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	added by us:     3rdparty/blobs
	added by us:     3rdparty/vboot

reproduce

git clone http://review.coreboot.org/p/coreboot
cd coreboot
git remote add google https://chromium.googlesource.com/chromiumos/third_party/coreboot
git fetch google

git cherry-pick -X ours 6c7143d7c9da038c130454a446bacd70cd6280db