Re: [BUG] ProgramError: merge ... .merge_file_4CPoEQ: No such file
- From
Fredrik Kuivinen <freku045@student.liu.se>
- Date
- Dec 6, 2005, 16:33 UTC
- Message-ID
- <20051206163314.GA6112@c165.ib.student.liu.se>
- In-Reply-To
- <E1EjdPu-00034z-Hu@jdl.com>
On Tue, Dec 06, 2005 at 08:03:38AM -0600, Jon Loeliger wrote:
Show 28 quoted lines
> > jdl@ubuntu:/usr/src/git-core$ git pull . origin > Trying really trivial in-index merge... > fatal: Merge requires file-level merging > Nope. > Merging HEAD with be61db922a230ae2638c27c071ee4b8c98f01f72 > Merging: > 4baf91676c2462796137e93917c75f2e14ebb877 Added documentation for few missing options. > be61db922a230ae2638c27c071ee4b8c98f01f72 git-merge-one-file: resurrect leading path creation. > found 1 common ancestor(s): > 23c99d84601316c1e51ebc1f0b9bec5cddd011fb git-mv to work with Perl 5.6 > Auto-merging Documentation/git-read-tree.txt > Traceback (most recent call last): > File "/home/jdl/bin/git-merge-recursive", line 868, in ? > firstBranch, secondBranch, graph) > File "/home/jdl/bin/git-merge-recursive", line 87, in merge > branch1Name, branch2Name) > File "/home/jdl/bin/git-merge-recursive", line 160, in mergeTrees > if not processEntry(entry, branch1Name, branch2Name): > File "/home/jdl/bin/git-merge-recursive", line 821, in processEntry > branch1Name, branch2Name) > File "/home/jdl/bin/git-merge-recursive", line 212, in mergeFile > src1, orig, src2], returnCode=True) > File "/home/jdl/share/git-core/python/gitMergeCommon.py", line 72, in runProgram > raise ProgramError(progStr, e.strerror) > ProgramError: merge -L HEAD/Documentation/git-read-tree.txt -L orig/Documentation/git-read-tree.txt -L be61db922a230ae2638c27c071ee4b8c98f01f72/Documentation/git-read-tree.txt .merge_file_DamWnQ .merge_file_U9K5YP .merge_file_4CPoEQ: No such file or directory > No merge strategy handled the merge. >
It seems that changes has been committed to Documentation/git-read-tree.txt in both the jdl branch and in origin. This shouldn't cause any problems but git-merge-recursive (which currently is the default merge strategy) uses merge(1) to do the file-level merging and it seems like merge(1) can't be found on your system.
Do you have merge(1) installed? More appropriately, is merge in your path? If it isn't installed it can usually be found in the rcs package in your distribution.
- Fredrik