{"thread":{"id":"53296","subject":"\"added by them\" uses wrong path?","startedAt":"2020-04-23T11:43:25Z","lastAt":"2020-04-23T11:43:25Z","messageCount":1,"participants":["Johannes Spangenberg"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"395999","messageId":"AM4PR0101MB22119DD9773B24C041A2E936B8D30@AM4PR0101MB2211.eurprd01.prod.exchangelabs.com","threadId":"53296","inReplyTo":null,"subject":"\"added by them\" uses wrong path?","fromName":"Johannes Spangenberg","fromEmail":"johanness@lucanet.com","sentAt":"2020-04-23T11:36:50Z","receivedAt":"2020-04-23T11:43:25Z","isPatch":false,"sender":{"key":"johanness@lucanet.com","avatar":null},"body":"Hello, I noticed that \"added by them\" might show paths which doesn't\nexits in any previous commit. I'm not sure if that is intended behavior\nbut it was very confusing to me. I attached a quite small repository to\nreproduce the problem. The problem occurs when branch \"a\" is merged into\n\"master\". Here is what happens since you might not want to look into the\nrepository yourself.\n\nGit shows me the following status.\n\n    $ git status\n    On branch master\n    You have unmerged paths.\n      (fix conflicts and run \"git commit\")\n      (use \"git merge --abort\" to abort the merge)\n\n    Unmerged paths:\n      (use \"git add/rm <file>...\" as appropriate to mark resolution)\n            both deleted:    front_0/separator/end_0\n            added by us:     front_1/separator/end_0\n            added by them:   front_1/separator/end_1\n\n    no changes added to commit (use \"git add\" and/or \"git commit -a\")\n\nHowever, the file in branch \"a\" was actually called\n`front_0/separator/end_1`, not `front_1/separator/end_1`.\n\nI updated to the latest version of Git for Windows to check if the issue\nstill exists.\n\n    $ git --version --build-options\n    git version 2.26.2.windows.1\n    cpu: x86_64\n    built from commit: 4267c88d0d8936ae723bba55e0576b1c4f3d4e1a\n    sizeof-long: 4\n    sizeof-size_t: 8\n\nBest Regards,\nJohannes\n\n"}]}