{"thread":{"id":"3747","subject":"Is 'merge' in your path?","startedAt":"2006-03-29T08:42:39Z","lastAt":"2006-03-29T08:47:55Z","messageCount":2,"participants":["Len Brown","Andreas Ericsson"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"18111","messageId":"200603290342.40970.len.brown@intel.com","threadId":"3747","inReplyTo":null,"subject":"Is 'merge' in your path?","fromName":"Len Brown","fromEmail":"len.brown@intel.com","sentAt":"2006-03-29T08:42:39Z","receivedAt":"2006-03-29T08:42:39Z","isPatch":false,"sender":{"key":"len.brown@intel.com","avatar":"https://gravatar.com/avatar/a091f34f66caadb51d85a8a496800c6ccae73737e2f45762373e6b8c55fa5dd6?d=mp&s=160"},"body":"trying to do a merge on my laptop using git as of today,\nbut it bombs out.  anybody seen this?\n\nlenb@toshiba:~/src> git --version\ngit version 1.3-rc1.GIT\n\nlenb@toshiba:~/src/linux-acpi-2.6> /lab/bin/git.update test\nTrying really trivial in-index merge...\nfatal: Merge requires file-level merging\nNope.\nMerging test with 224b148ef7c9a00642eb33dbdf62f2840bde974f\nMerging:\n9dc2a5c16ba732595afa926aabbf07efaef40b92 Pull trivial into test branch\n224b148ef7c9a00642eb33dbdf62f2840bde974f Merge branch 'for-linus' of \nmaster.kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394\nfound 1 common ancestor(s):\n35ab0e88c63fb8e61013011560ad10e6200b5ee0 Merge branch 'release' of \ngit://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6\nRemoving arch/sparc64/lib/find_bit.c\nRemoving drivers/scsi/qla2xxx/ql6312.c\nRemoving include/asm-arm/arch-h720x/param.h\nRemoving include/asm-arm/arch-imx/irq.h\nRemoving drivers/usb/media/pwc/pwc-kiara.c\nRemoving include/asm-ppc/xparameters.h\nRemoving drivers/i2c/busses/i2c-frodo.c\nRemoving include/asm-arm/arch-lh7a40x/irq.h\nRemoving drivers/char/rio/riopcicopy.c\nAuto-merging Documentation/kernel-parameters.txt\nmerge -L test/Documentation/kernel-parameters.txt -L \norig/Documentation/kernel-parameters.txt -L \n224b148ef7c9a00642eb33dbdf62f2840bde974f/Documentation/kernel-parameters.txt .merge_file_2KLpUR .merge_file_H6NRcP .merge_file_WLV6HQ: \nNo such file or directory\nFailed to execute 'merge'. merge(1) is used as the file-level merge tool. Is \n'merge' in your path?\nNo merge strategy handled the merge.\nlenb@toshiba:~/src/linux-acpi-2.6> which git-merge\n/home/lenb/bin/git-merge\nlenb@toshiba:~/src/linux-acpi-2.6> which git\n/home/lenb/bin/git\nlenb@toshiba:~/src/linux-acpi-2.6>                               \n"},{"id":"18112","messageId":"442A49BB.2060200@op5.se","threadId":"3747","inReplyTo":"200603290342.40970.len.brown@intel.com","subject":"Re: Is 'merge' in your path?","fromName":"Andreas Ericsson","fromEmail":"ae@op5.se","sentAt":"2006-03-29T08:47:55Z","receivedAt":"2006-03-29T08:47:55Z","isPatch":false,"sender":{"key":"ae@op5.se","avatar":"https://gravatar.com/avatar/426e89595c75a8f5252dd0c989e5fabe5bcac616e68557427ad9aef6b0ca342a?d=mp&s=160"},"body":"Len Brown wrote:\n> trying to do a merge on my laptop using git as of today,\n> but it bombs out.  anybody seen this?\n> \n> lenb@toshiba:~/src> git --version\n> git version 1.3-rc1.GIT\n> \n> lenb@toshiba:~/src/linux-acpi-2.6> /lab/bin/git.update test\n> Trying really trivial in-index merge...\n> fatal: Merge requires file-level merging\n\n....\n\n> Failed to execute 'merge'. merge(1) is used as the file-level merge tool. Is \n> 'merge' in your path?\n> No merge strategy handled the merge.\n> lenb@toshiba:~/src/linux-acpi-2.6> which git-merge\n> /home/lenb/bin/git-merge\n> lenb@toshiba:~/src/linux-acpi-2.6> which git\n> /home/lenb/bin/git\n> lenb@toshiba:~/src/linux-acpi-2.6>\n\n\nWhat does \"which merge\" tell you? If it turns up blank, you know the \nproblem. The merge program is usually found in the rcs package.\n\n-- \nAndreas Ericsson                   andreas.ericsson@op5.se\nOP5 AB                             www.op5.se\nTel: +46 8-230225                  Fax: +46 8-230231\n"}]}