You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
However, VFS for Git reports this as a conflict instead:
$ gvfs clone https://dev.azure.com/gvfs/ci/_git/ForTests ForTests-VFS
$ cd ForTests-VFS/src
$ git merge --no-ff origin/FunctionalTests_20200701_MergeConflict_FolderToFile
CONFLICT (directory/file): There is a directory with name Scripts in HEAD. Adding Scripts as Scripts~origin_FunctionalTests_20200701_MergeConflict_FolderToFile
Automatic merge failed; fix conflicts and then commit the result.
$ git status
On branch test
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Changes to be committed:
deleted: Scripts/SetupDevService.bat
deleted: Scripts/StartDevService.bat
deleted: Scripts/StopDevService.bat
Unmerged paths:
(use "git add <file>..." to mark resolution)
added by them: Scripts
Untracked files:
(use "git add <file>..." to include in what will be committed)
Scripts~origin_FunctionalTests_20200701_MergeConflict_FolderToFile
The text was updated successfully, but these errors were encountered:
VFS for Git is somehow changing the behavior of
git merge
when handling a directory->file change.Here is a repro scenario:
However, VFS for Git reports this as a conflict instead:
The text was updated successfully, but these errors were encountered: