Hello, I noticed that "added by them" might show paths which doesn't
exits in any previous commit. I'm not sure if that is intended behavior
but it was very confusing to me. I attached a quite small repository to
reproduce the problem. The problem occurs when branch "a" is merged into
"master". Here is what happens since you might not want to look into the
repository yourself.
Git shows me the following status.
$ git status
On branch master
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
both deleted: front_0/separator/end_0
added by us: front_1/separator/end_0
added by them: front_1/separator/end_1
no changes added to commit (use "git add" and/or "git commit -a")
However, the file in branch "a" was actually called
`front_0/separator/end_1`, not `front_1/separator/end_1`.
I updated to the latest version of Git for Windows to check if the issue
still exists.
$ git --version --build-options
git version 2.26.2.windows.1
cpu: x86_64
built from commit: 4267c88d0d8936ae723bba55e0576b1c4f3d4e1a
sizeof-long: 4
sizeof-size_t: 8
Best Regards,
Johannes
Attachment:
git_wrong_path_in_merge.tgz
Description: git_wrong_path_in_merge.tgz
<<attachment: smime.p7s>>
