{"thread":{"id":"35766","subject":"Strange merge output.","startedAt":"2014-01-30T10:52:27Z","lastAt":"2014-01-30T11:24:31Z","messageCount":2,"participants":["Vincent Bernardi","David Kastrup"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"233942","messageId":"55DE3FAC-BD7E-4AB2-8A18-CF85BB859465@kameleoon.com","threadId":"35766","inReplyTo":null,"subject":"Strange merge output.","fromName":"Vincent Bernardi","fromEmail":"vincent@kameleoon.com","sentAt":"2014-01-30T10:52:27Z","receivedAt":"2014-01-30T10:52:27Z","isPatch":false,"sender":{"key":"vincent@kameleoon.com","avatar":null},"body":"Hi,\nI asked about this problem on #git@freenode and someone suggested I submit it to this list. I have a case where the output of a merge gives a conflict and produces the following file:\n\nCode Block A\n<<<<<<< HEAD\n=======\nCode Block B\n>>>>>>> branch-B\nCode Block B' (similar to code block B but not exactly the same).\n\nHere is what HEAD looks like \nCode Block A\nCode Block B' \n\nand branch-B:\nCode Block A\nCode Block B\n\nI thought that taking a conflicted file like above and removing the three following lines:\n<<<<<<< HEAD\n=======\n>>>>>>> branch-B\n\nwas supposed to produce *exactly* the branch-B version?\n\n1°/ was I wrong to believe this implied promise?\n2°/ if not, is this a known problem with git merge's default recursive strategy? (I didn't change any default configuration about merging).\n3°/ If yes to question 2°/, is there a known workaround for it? I am trying to move my team to git, but we already have a hard time understanding how it works. I'm really hoping it's a case of us not understanding things and not a bug :-)\n\nThanks in advance for any answer, I'm willing to answer any question to help create a test case for this.\n\nVincent Bernardi\n\nP.S.: I am using git 1.8.3.4\n-----\nThe Kameleoon team.\nhttp://www.kameleoon.com"},{"id":"233943","messageId":"87y51x4sr4.fsf@fencepost.gnu.org","threadId":"35766","inReplyTo":"55DE3FAC-BD7E-4AB2-8A18-CF85BB859465@kameleoon.com","subject":"Re: Strange merge output.","fromName":"David Kastrup","fromEmail":"dak@gnu.org","sentAt":"2014-01-30T11:24:31Z","receivedAt":"2014-01-30T11:24:31Z","isPatch":false,"sender":{"key":"dak@gnu.org","avatar":"https://avatars.githubusercontent.com/u/52141349?v=4"},"body":"Vincent Bernardi <vincent@kameleoon.com> writes:\n\n> Hi,\n> I asked about this problem on #git@freenode and someone suggested I\n> submit it to this list. I have a case where the output of a merge\n> gives a conflict and produces the following file:\n>\n> Code Block A\n> <<<<<<< HEAD\n> =======\n> Code Block B\n>>>>>>>> branch-B\n> Code Block B' (similar to code block B but not exactly the same).\n>\n> Here is what HEAD looks like \n> Code Block A\n> Code Block B' \n>\n> and branch-B:\n> Code Block A\n> Code Block B\n>\n> I thought that taking a conflicted file like above and removing the\n> three following lines:\n> <<<<<<< HEAD\n> =======\n>>>>>>>> branch-B\n>\n> was supposed to produce *exactly* the branch-B version?\n\nNo?  It will produce the branch-B version in the conflicted area, but\nthat does not mean that conflict resolution might not have been done\noutside of that area.\n\n-- \nDavid Kastrup\n"}]}