{"thread":{"id":"50253","subject":"A seemingly wrong PR merge resolution.","startedAt":"2019-01-17T20:56:48Z","lastAt":"2019-01-18T00:32:39Z","messageCount":2,"participants":["Mark Kharitonov"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"367028","messageId":"CAG2YSPzFzpwKpDo4cCjUinpTDhFgd3ax0f_g--ZDd76=UJt35g@mail.gmail.com","threadId":"50253","inReplyTo":"CAG2YSPxynGyj3kFxPbvHDETdievY0c_NGSohPSFURuNjhyaYWQ@mail.gmail.com","subject":"A seemingly wrong PR merge resolution.","fromName":"Mark Kharitonov","fromEmail":"mark.kharitonov@gmail.com","sentAt":"2019-01-17T20:56:35Z","receivedAt":"2019-01-17T20:56:48Z","isPatch":false,"sender":{"key":"mark.kharitonov@gmail.com","avatar":"https://gravatar.com/avatar/ebee0a786b7cfc7a49e9d93b057b6fc3f62c01f916755f2c26e67ec8c2b2652c?d=mp&s=160"},"body":"Hi,\n\nI have a very strange issue where a change has disappeared from the PR\nmerge commit.\n\nI described it in great detail on SO here -\nhttps://stackoverflow.com/questions/54244042/incorrect-pr-merge-in-vsts-the-new-change-disappeared-after-the-merge\n\n(Sorry for the spaces, did not want it to be rejected)\n\nThe post contains quite a few images and it would be cumbersome to\nreplicate it faithfully in plain text.\n\n-- \nBe well and prosper.\n==============================\n\"There are two kinds of people.Those whose guns are loaded and those who dig.\"\n   (\"The good, the bad and the ugly\")\nSo let us drink for our guns always be loaded.\n\n\n-- \nBe well and prosper.\n==============================\n\"There are two kinds of people.Those whose guns are loaded and those who dig.\"\n   (\"The good, the bad and the ugly\")\nSo let us drink for our guns always be loaded.\n"},{"id":"367040","messageId":"CAG2YSPzATssL9Ym4FWszfOqEMZsAR2VN+mm-Qs7XFhod79E88w@mail.gmail.com","threadId":"50253","inReplyTo":"CAG2YSPzFzpwKpDo4cCjUinpTDhFgd3ax0f_g--ZDd76=UJt35g@mail.gmail.com","subject":"Re: A seemingly wrong PR merge resolution.","fromName":"Mark Kharitonov","fromEmail":"mark.kharitonov@gmail.com","sentAt":"2019-01-18T00:32:23Z","receivedAt":"2019-01-18T00:32:39Z","isPatch":false,"sender":{"key":"mark.kharitonov@gmail.com","avatar":"https://gravatar.com/avatar/ebee0a786b7cfc7a49e9d93b057b6fc3f62c01f916755f2c26e67ec8c2b2652c?d=mp&s=160"},"body":"Please, ignore - the developer used the Merge Conflict resolution\nplugin for VSTS to take the target of the merge, instead of the\nsource.\n\nPlease, accept my apologies for the noise.\n\nLe jeu. 17 janv. 2019 à 15:56, Mark Kharitonov\n<mark.kharitonov@gmail.com> a écrit :\n>\n> Hi,\n>\n> I have a very strange issue where a change has disappeared from the PR\n> merge commit.\n>\n> I described it in great detail on SO here -\n> https://stackoverflow.com/questions/54244042/incorrect-pr-merge-in-vsts-the-new-change-disappeared-after-the-merge\n>\n> (Sorry for the spaces, did not want it to be rejected)\n>\n> The post contains quite a few images and it would be cumbersome to\n> replicate it faithfully in plain text.\n>\n> --\n> Be well and prosper.\n> ==============================\n> \"There are two kinds of people.Those whose guns are loaded and those who dig.\"\n>    (\"The good, the bad and the ugly\")\n> So let us drink for our guns always be loaded.\n>\n>\n> --\n> Be well and prosper.\n> ==============================\n> \"There are two kinds of people.Those whose guns are loaded and those who dig.\"\n>    (\"The good, the bad and the ugly\")\n> So let us drink for our guns always be loaded.\n\n\n\n-- \nBe well and prosper.\n==============================\n\"There are two kinds of people.Those whose guns are loaded and those who dig.\"\n   (\"The good, the bad and the ugly\")\nSo let us drink for our guns always be loaded.\n"}]}