Re: A seemingly wrong PR merge resolution.

From: Mark Kharitonov <mark.kharitonov@gmail.com>
Date: Jan 18, 2019, 00:32 UTC
Message-ID: <CAG2YSPzATssL9Ym4FWszfOqEMZsAR2VN+mm-Qs7XFhod79E88w@mail.gmail.com>
In-Reply-To: <CAG2YSPzFzpwKpDo4cCjUinpTDhFgd3ax0f_g--ZDd76=UJt35g@mail.gmail.com>

Please, ignore - the developer used the Merge Conflict resolution plugin for VSTS to take the target of the merge, instead of the source.

Please, accept my apologies for the noise.

Le jeu. 17 janv. 2019 à 15:56, Mark Kharitonov <mark.kharitonov@gmail.com> a écrit :

Show 28 quoted lines

>
> Hi,
>
> I have a very strange issue where a change has disappeared from the PR
> merge commit.
>
> I described it in great detail on SO here -
> https://stackoverflow.com/questions/54244042/incorrect-pr-merge-in-vsts-the-new-change-disappeared-after-the-merge
>
> (Sorry for the spaces, did not want it to be rejected)
>
> The post contains quite a few images and it would be cumbersome to
> replicate it faithfully in plain text.
>
> --
> Be well and prosper.
> ==============================
> "There are two kinds of people.Those whose guns are loaded and those who dig."
>    ("The good, the bad and the ugly")
> So let us drink for our guns always be loaded.
>
>
> --
> Be well and prosper.
> ==============================
> "There are two kinds of people.Those whose guns are loaded and those who dig."
>    ("The good, the bad and the ugly")
> So let us drink for our guns always be loaded.

-- 
Be well and prosper.
==============================
"There are two kinds of people.Those whose guns are loaded and those who dig."
   ("The good, the bad and the ugly")
So let us drink for our guns always be loaded.