{"thread":{"id":"18840","subject":"[Question] Why sometimes the unmerged file doesn't contains any conflicts","startedAt":"2009-04-13T02:35:06Z","lastAt":"2009-04-13T03:43:52Z","messageCount":3,"participants":["Johnny Lee","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"111149","messageId":"488807870904121935nab40117n56070570ecd31aa7@mail.gmail.com","threadId":"18840","inReplyTo":null,"subject":"[Question] Why sometimes the unmerged file doesn't contains any conflicts","fromName":"Johnny Lee","fromEmail":"johnnylee194@gmail.com","sentAt":"2009-04-13T02:35:06Z","receivedAt":"2009-04-13T02:35:06Z","isPatch":false,"sender":{"key":"johnnylee194@gmail.com","avatar":"https://gravatar.com/avatar/88def25aef325f1ca5607d6009a3f9663fcc2db6adfa93f7bd999c098710189f?d=mp&s=160"},"body":"Hi all,\n\nSometimes when I merge two branches, the unmerged files don't contain\nany conflicts.\nWhen I edit the file, I can't find any conflict information. Usually\nall I have to do is manually \"git add\" them.\n\nI do the merge with a clean workspace, all changes have been committed.\nThis doesn't happen all the time, usually the unmerged files contains\nthe correct conflict information inside.\n\nDo you know what's going on here?\nThe version of my git is: 1.6.2.1\n\nThanks for your consideration.\n\nRegards,\nJohnny\n\n-- \nwe all have our crosses to bear\n"},{"id":"111150","messageId":"7vk55pxoax.fsf@gitster.siamese.dyndns.org","threadId":"18840","inReplyTo":"488807870904121935nab40117n56070570ecd31aa7@mail.gmail.com","subject":"Re: [Question] Why sometimes the unmerged file doesn't contains any conflicts","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-04-13T02:47:18Z","receivedAt":"2009-04-13T02:47:18Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johnny Lee writes:\n\n> Sometimes when I merge two branches, the unmerged files don't contain\n> any conflicts.\n> When I edit the file, I can't find any conflict information. Usually\n> all I have to do is manually \"git add\" them.\n>\n> I do the merge with a clean workspace, all changes have been committed.\n> This doesn't happen all the time, usually the unmerged files contains\n> the correct conflict information inside.\n>\n> Do you know what's going on here?\n> The version of my git is: 1.6.2.1\n\nDo you see something like these output when it happens? If that is what\nis happening to you, then it is perfectly normal, and the command even\ngives explanations on what it did to you. The only thing you need to do\nis to read them ;-).\n\n $ git merge lt/pack-object-memuse\n Auto-merging builtin-pack-objects.c\n CONFLICT (content): Merge conflict in builtin-pack-objects.c\n Auto-merging builtin-rev-list.c\n CONFLICT (content): Merge conflict in builtin-rev-list.c\n Auto-merging list-objects.c\n CONFLICT (content): Merge conflict in list-objects.c\n Auto-merging list-objects.h\n CONFLICT (content): Merge conflict in list-objects.h\n Auto-merging revision.c\n Auto-merging revision.h\n Auto-merging upload-pack.c\n CONFLICT (content): Merge conflict in upload-pack.c\n Resolved 'builtin-pack-objects.c' using previous resolution.\n Resolved 'builtin-rev-list.c' using previous resolution.\n Resolved 'list-objects.c' using previous resolution.\n Resolved 'list-objects.h' using previous resolution.\n Resolved 'upload-pack.c' using previous resolution.\n Automatic merge failed; fix conflicts and then commit the result.\n\nNotice the last set of lines \"Resolved '%s' using previous resolution.\"\n\nAnother possibility is the common ancestor of the two branches did not\nhave the file in question and you added the same file on each of these\nbranches in a non-conflicting way. That sometimes suggests a bad\nworkflow, but in an environment where two people independently pick up the\nsame patch on their branches and you end up merging with these two people,\nit is also perfectly normal.\n"},{"id":"111156","messageId":"488807870904122043q5bf3884fu1012446e1e71c048@mail.gmail.com","threadId":"18840","inReplyTo":"7vk55pxoax.fsf@gitster.siamese.dyndns.org","subject":"Re: [Question] Why sometimes the unmerged file doesn't contains any conflicts","fromName":"Johnny Lee","fromEmail":"johnnylee194@gmail.com","sentAt":"2009-04-13T03:43:52Z","receivedAt":"2009-04-13T03:43:52Z","isPatch":false,"sender":{"key":"johnnylee194@gmail.com","avatar":"https://gravatar.com/avatar/88def25aef325f1ca5607d6009a3f9663fcc2db6adfa93f7bd999c098710189f?d=mp&s=160"},"body":"I didn't see the log of \"Resolved '%s' using previous resolution.\".\nI'm must having the latter situation.\n\nThanks Junio for pointing this out for me.\n\nCheers,\nJohnny\n\nOn Mon, Apr 13, 2009 at 10:47 AM, Junio C Hamano wrote:\n> Johnny Lee writes:\n>\n>> Sometimes when I merge two branches, the unmerged files don't contain\n>> any conflicts.\n>> When I edit the file, I can't find any conflict information. Usually\n>> all I have to do is manually \"git add\" them.\n>>\n>> I do the merge with a clean workspace, all changes have been committed.\n>> This doesn't happen all the time, usually the unmerged files contains\n>> the correct conflict information inside.\n>>\n>> Do you know what's going on here?\n>> The version of my git is: 1.6.2.1\n>\n> Do you see something like these output when it happens?  If that is what\n> is happening to you, then it is perfectly normal, and the command even\n> gives explanations on what it did to you.  The only thing you need to do\n> is to read them ;-).\n>\n>    $ git merge lt/pack-object-memuse\n>    Auto-merging builtin-pack-objects.c\n>    CONFLICT (content): Merge conflict in builtin-pack-objects.c\n>    Auto-merging builtin-rev-list.c\n>    CONFLICT (content): Merge conflict in builtin-rev-list.c\n>    Auto-merging list-objects.c\n>    CONFLICT (content): Merge conflict in list-objects.c\n>    Auto-merging list-objects.h\n>    CONFLICT (content): Merge conflict in list-objects.h\n>    Auto-merging revision.c\n>    Auto-merging revision.h\n>    Auto-merging upload-pack.c\n>    CONFLICT (content): Merge conflict in upload-pack.c\n>    Resolved 'builtin-pack-objects.c' using previous resolution.\n>    Resolved 'builtin-rev-list.c' using previous resolution.\n>    Resolved 'list-objects.c' using previous resolution.\n>    Resolved 'list-objects.h' using previous resolution.\n>    Resolved 'upload-pack.c' using previous resolution.\n>    Automatic merge failed; fix conflicts and then commit the result.\n>\n> Notice the last set of lines \"Resolved '%s' using previous resolution.\"\n>\n> Another possibility is the common ancestor of the two branches did not\n> have the file in question and you added the same file on each of these\n> branches in a non-conflicting way.  That sometimes suggests a bad\n> workflow, but in an environment where two people independently pick up the\n> same patch on their branches and you end up merging with these two people,\n> it is also perfectly normal.\n>\n>\n\n\n\n-- \nwe all have our crosses to bear\n"}]}