Is 'merge' in your path?

DISCUSSION Len Brown 2 participants 2 messages Jun 15, 2016

lore

Share & tools

lore

Len Brown

author

2016-06-15 22:42 UTC #0 lore raw

trying to do a merge on my laptop using git as of today, but it bombs out. anybody seen this?

lenb@toshiba:~/src> git --version
git version 1.3-rc1.GIT

lenb@toshiba:~/src/linux-acpi-2.6> /lab/bin/git.update test
Trying really trivial in-index merge...
fatal: Merge requires file-level merging
Nope.
Merging test with 224b148ef7c9a00642eb33dbdf62f2840bde974f
Merging:
9dc2a5c16ba732595afa926aabbf07efaef40b92 Pull trivial into test branch
224b148ef7c9a00642eb33dbdf62f2840bde974f Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394
found 1 common ancestor(s):
35ab0e88c63fb8e61013011560ad10e6200b5ee0 Merge branch 'release' of
git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Removing arch/sparc64/lib/find_bit.c
Removing drivers/scsi/qla2xxx/ql6312.c
Removing include/asm-arm/arch-h720x/param.h
Removing include/asm-arm/arch-imx/irq.h
Removing drivers/usb/media/pwc/pwc-kiara.c
Removing include/asm-ppc/xparameters.h
Removing drivers/i2c/busses/i2c-frodo.c
Removing include/asm-arm/arch-lh7a40x/irq.h
Removing drivers/char/rio/riopcicopy.c
Auto-merging Documentation/kernel-parameters.txt
merge -L test/Documentation/kernel-parameters.txt -L
orig/Documentation/kernel-parameters.txt -L 224b148ef7c9a00642eb33dbdf62f2840bde974f/Documentation/kernel-parameters.txt .merge_file_2KLpUR .merge_file_H6NRcP .merge_file_WLV6HQ:
No such file or directory
Failed to execute 'merge'. merge(1) is used as the file-level merge tool. Is
'merge' in your path?
No merge strategy handled the merge.
lenb@toshiba:~/src/linux-acpi-2.6> which git-merge
/home/lenb/bin/git-merge
lenb@toshiba:~/src/linux-acpi-2.6> which git
/home/lenb/bin/git
lenb@toshiba:~/src/linux-acpi-2.6>

Andreas Ericsson

2016-06-15 22:42 UTC #1 lore raw

Quoted 9 lines · Len Brown

trying to do a merge on my laptop using git as of today, but it bombs out. anybody seen this?
lenb@toshiba:~/src> git --version
git version 1.3-rc1.GIT
lenb@toshiba:~/src/linux-acpi-2.6> /lab/bin/git.update test Trying really trivial in-index merge...
fatal: Merge requires file-level merging

....

Quoted 7 lines

Failed to execute 'merge'. merge(1) is used as the file-level merge tool. Is 'merge' in your path? No merge strategy handled the merge.
lenb@toshiba:~/src/linux-acpi-2.6> which git-merge
/home/lenb/bin/git-merge
lenb@toshiba:~/src/linux-acpi-2.6> which git
/home/lenb/bin/git
lenb@toshiba:~/src/linux-acpi-2.6>

What does "which merge" tell you? If it turns up blank, you know the problem. The merge program is usually found in the rcs package.

Signature · 3 lines

Andreas Ericsson                   [email protected]
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231