microsoft / microsoft/VFSForGit

"System.InvalidOperationException: All entries should be unique" when a file has two "Yours" merge state entries in the index

Open
#283 3 comments 0 reactions 1 assignee View on GitHub

@kewillford is already working on this.

Since Sep 21, 2018.

type: bug
Dominant language
C#
Stars
6.1k
Forks
474
Avg merge
2d 4h
Merged PRs (30d)
8

Description

M:\expert>git ls-files -svodc file.cpp
M 100644 581b05db66d2d9205967e0b3f425cbec9b8acd5c 1     file.cpp
M 100644 6be0a197393f94ca7511cb2fea2de2124419060a 2     file.cpp
R 100644 581b05db66d2d9205967e0b3f425cbec9b8acd5c 1     file.cpp
R 100644 6be0a197393f94ca7511cb2fea2de2124419060a 2     file.cpp

The issue is most likely here:

https://github.com/Microsoft/VFSForGit/blob/957154573d4a68173992127796a3d88dfb679087/GVFS/GVFS.Virtualization/Projection/GitIndexProjection.GitIndexParser.cs#L95

Contributor guide

Open the contributing guide

First steps

  1. Read the whole issue, then the project's contributing guide.
  2. Comment on the issue to say you are picking it up — it saves two people doing the same work.
  3. Fork the repository and make your change on a branch.
  4. Open a pull request that references the issue number.

Assessment

This issue has not been assessed yet.

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.