{"thread":{"id":"2756","subject":"Re: [BUG] ProgramError: merge ... .merge_file_4CPoEQ: No such file","startedAt":"2005-12-06T16:47:50Z","lastAt":"2005-12-06T16:47:50Z","messageCount":1,"participants":["Jon Loeliger"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"13266","messageId":"E1Ejfyo-0003ae-2K@jdl.com","threadId":"2756","inReplyTo":null,"subject":"Re: [BUG] ProgramError: merge ... .merge_file_4CPoEQ: No such file","fromName":"Jon Loeliger","fromEmail":"jdl@freescale.com","sentAt":"2005-12-06T16:47:50Z","receivedAt":"2005-12-06T16:47:50Z","isPatch":false,"sender":{"key":"jdl@jdl.com","avatar":"https://gravatar.com/avatar/75ce9a10b151acd2c28ec4ab2136dba7b2ff1634530bd04b155981a749d08a64?d=mp&s=160"},"body":"> It seems that changes has been committed to\n> Documentation/git-read-tree.txt in both the jdl branch and in\n> origin.\n\nYes.\n\n> This shouldn't cause any problems but git-merge-recursive\n> (which currently is the default merge strategy) uses merge(1) to do\n> the file-level merging and it seems like merge(1) can't be found on\n> your system.\n> \n> Do you have merge(1) installed? More appropriately, is merge in your\n> path? If it isn't installed it can usually be found in the rcs package\n> in your distribution.\n\nOh wow.  Exactly correct.\n\nHere's Jon building up the new Ubuntu box, and thinking, \"I'll\nbe using git, so I don't need to install RCS or CVS anymore.\" :-)\n\nAfter installing RCS, here's what we get:\n\n    jdl@ubuntu:/usr/src/git-core$ git reset --hard jdl\n    jdl@ubuntu:/usr/src/git-core$ git pull . origin\n    Trying really trivial in-index merge...\n    fatal: Merge requires file-level merging\n    Nope.\n    Merging HEAD with be61db922a230ae2638c27c071ee4b8c98f01f72\n    Merging:\n    4baf91676c2462796137e93917c75f2e14ebb877 Added documentation for few missing options.\n    be61db922a230ae2638c27c071ee4b8c98f01f72 git-merge-one-file: resurrect leading path creation.\n    found 1 common ancestor(s):\n    23c99d84601316c1e51ebc1f0b9bec5cddd011fb git-mv to work with Perl 5.6\n    Auto-merging Documentation/git-read-tree.txt\n    CONFLICT (content): Merge conflict in Documentation/git-read-tree.txt\n\n    Automatic merge failed/prevented; fix up by hand\n\n\nThanks!\njdl\n"}]}