❔ Help me make sense of the file status I see during git merge
I am merging branch
refactored into branch develop. The former, as the name implies, is a branch that refactors the folders, files, and namespaces of the project. With develop checked out, I run git merge refactored. Some conflicts are reported as expected. Amongst them, consider file Core.cs that in develop existed at path Shared/src/Core/Core.cs. In refactored this file has been moved into location Common/Core/Core.cs. However, git does not detect the move. Instead it reports the following.
Running git status | select-string "/Core.cs" -SimpleMatch I get all lines in the git status output that contain the file name. Interestingly I see:
1.I expected to see 1. But 2. is odd. I would expect to see something likedeleted: /Shared/src/Core/Core.cs2.both modified: /Common/Core/Core.cs
new file added because /Common/Core/Core.cs only exists
Further. git ls-files -s /Common/Core/Core.cs shows this file in all merge stages, which is bizzare because this path did not exist at all in develop:
100644 be51adb6d3...b421a 1 Common/Core/Core.cs 100644 0736c00294...252e7 2 Common/Core/Core.cs 100644 1be6053172...3ca54 3 Common/Core/Core.csCan someone help me decipher this information?
1 Reply
Looks like nothing has happened here. I will mark this as stale and this post will be archived until there is new activity.