Git stash pop behaviour with

Reproduction steps

• In branch A with master as remove we have a new file untracked.
• In master we have added the same file already and it's part of commit a123

we are updating branch A to the commit a123 so we are doing:

var stash = repository.Stashes.Add(signature, StashModifiers.IncludeUntracked);
repository.Merge('a123', signature);

if (stash != null)
{
	repository.Stashes.Pop(0);
}

if(repository.Index.Conflicts.Any()){
      showUserAllTheConflictsAndGiveOptionsToFixThem
}

Expected behavior

When doing the Pop the change should get marked as having a conflict and being modified

Actual behavior

There won't be any conflicts even though the file is marked as modified and has been modified with the conflict markers

Version of LibGit2Sharp (release number or SHA1)

0.27.0-preview-0034

Operating system(s) tested; .NET runtime tested

Windows Server 2012; .NET 4.7.2

Riproduci il caso usando repository.Stashes.Add con IncludeUntracked, repository.Merge, repository.Stashes.Pop(0) e repository.Index.Conflicts su LibGit2Sharp 0.27.0-preview-0034. Esamina prima il modo in cui stash pop segnala i conflitti quando un file non tracciato entra in conflitto con un file tracciato, quindi verifica che il conflitto sia esposto tramite l'indice mentre il file di lavoro rimane modificato con i marcatori di conflitto.