threads / discuss / 50253

A seemingly wrong PR merge resolution.

Subject: A seemingly wrong PR merge resolution.

## tl;dr

2 messages between Jan 17, 2019 and Jan 18, 2019.

replies: 1people: 1as markdown or json

Mark Kharitonov· Jan 17, 2019, 20:56 UTC · lore
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.
Mark Kharitonov· Jan 18, 2019, 00:32 UTC · re: Mark Kharitonov · lore

Re: A seemingly wrong PR merge resolution.

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.

← back to recent threads