{"thread":{"id":"17001","subject":"git merge failure: what next?","startedAt":"2009-01-06T00:41:55Z","lastAt":"2009-01-06T00:41:55Z","messageCount":1,"participants":["Daniel Quinlan"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"99394","messageId":"200901060042.n060g1Cm014451@rs40.luxsci.com","threadId":"17001","inReplyTo":null,"subject":"git merge failure: what next?","fromName":"Daniel Quinlan","fromEmail":"danq@brtt.com","sentAt":"2009-01-06T00:41:55Z","receivedAt":"2009-01-06T00:41:55Z","isPatch":false,"sender":{"key":"danq@brtt.com","avatar":null},"body":"I cannot figure out how to resolve a problem with git merge.\n\nI usually use \"git pull\" to merge changes from a central repository  \nbefore pushing local changes to the central repository.\nI've learned from bitter experience not to have changes in the  \nintermediate cache/stage/index, since that always leads to\nconfusion -- but it's possible I failed to follow that rule in this  \ncase.\n\nThe working tree is currently dirty with lots of changes I'm not ready  \nto commit.\n\nAnyway, now  I get this:\n\n> % git pull\n> *** : needs update\n> \t.\n> \t.\n> fatal: Entry 'correct/orblag/orblag' would be overwritten by merge.  \n> Cannot merge.\n> Merge with strategy recursive failed.\n> %\n>\n\nAt this point, I usually do something like remove the 'correct/orblag/ \norblag', knowing that I just want\nwhatever is in the repository (or ultimately, not caring, provided I  \ncan get past this message).\n\nHowever, that doesn't work:\n\n> % rm correct/orblag/orblag\n> rm: cannot remove `correct/orblag/orblag': No such file or directory\n>\n\nAlso,\n\n> % git mergetool\n> No files need merging\n>\n\n\nI'm stuck.\n\nA related problem is that although I'm usually able to get past this  \nproblem by deleting\na file, this can be tedious as there may be multiple files with  \nconflicts, but git-merge only\nlets me know about the first one it finds.  Knowing all the conflicts  \nright off the bat would\ngive me an idea about the breadth of the problem.\n\nAnother possibility I might like to see is the CVS approach -- just  \ncreate combined files\nwith all the differences in them instead of hanging up on the first  \nconflict.\n\nSuggestions?\nThanks,\n-- danq\n"}]}