* A seemingly wrong PR merge resolution.
[not found] <CAG2YSPxynGyj3kFxPbvHDETdievY0c_NGSohPSFURuNjhyaYWQ@mail.gmail.com>
@ 2019-01-17 20:56 ` Mark Kharitonov
2019-01-18 0:32 ` Mark Kharitonov
0 siblings, 1 reply; 2+ messages in thread
From: Mark Kharitonov @ 2019-01-17 20:56 UTC (permalink / raw)
To: Git Mailing List
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: A seemingly wrong PR merge resolution.
2019-01-17 20:56 ` A seemingly wrong PR merge resolution Mark Kharitonov
@ 2019-01-18 0:32 ` Mark Kharitonov
0 siblings, 0 replies; 2+ messages in thread
From: Mark Kharitonov @ 2019-01-18 0:32 UTC (permalink / raw)
To: Git Mailing List
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 :
>
> 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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-18 0:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <CAG2YSPxynGyj3kFxPbvHDETdievY0c_NGSohPSFURuNjhyaYWQ@mail.gmail.com>
2019-01-17 20:56 ` A seemingly wrong PR merge resolution Mark Kharitonov
2019-01-18 0:32 ` Mark Kharitonov
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).