fatal: ... is already checked out at ...

Hi, Please, observe: C:\Dayforce\56 [release/r-856 ≡]> git --version git version 2.18.0.windows.1 C:\Dayforce\56 [release/r-856 ≡]> git worktree list C:/Dayforce/tipc80539e06d [arch/shelve/532684] C:/Dayforce/55 1362776f49 [release/r-855] C:/Dayforce/55WFM 00 [wfm/855wfm] C:/Dayfo

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 a écrit : > > Hi, > > I have a very strange issue wh

A seemingly wrong PR merge resolution.

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 rej

Re: Can git tell me which uncommitted files clash with the incoming changes?

: > > On Mon, Dec 17, 2018 at 6:17 PM Elijah Newren wrote: > > > > On Mon, Dec 17, 2018 at 8:26 AM Duy Nguyen wrote: > > > > > > On Mon, Dec 17, 2018 at 2:11 PM Mark Kharitonov > > > wrote: > > > > > > > > Hi, > > > &

Can git tell me which uncommitted files clash with the incoming changes?

Hi, I have asked this question on SO (https://stackoverflow.com/questions/53679167/can-git-tell-me-which-uncommitted-files-clash-with-the-incoming-changes) and usually there are tons of responses on Git questions, but not on this one. Allow me to quote it now. Please, observe: C:\Dayforce\te