更改的文件始终显示在主分支中

Question

Does anyone know what causes this? I've pushed some files to my branch. It has no conflicts whatsoever, so my senior have merged it with the main branch, but whenever I switch to the main branch to fetch origin to get the latest update, the files that I've worked before previously always show up in the main as changed files but with "deleted" mark on it. Also, the files keep returning whenever I discard the changes, switch to my branch, and switch it back to main.

I'm using Github desktop.

Answer 1

You're probably just misunderstanding the GUI display. It's confusing. (That is one reason why I never use a GUI on Git.) It sounds like a matter of interpreting a diff. If your local main branch did not have these files, and you fetch the remote origin/main which does have these files, then it is perfectly true that with respect to origin/main, your local main branch is "missing" the files, which is what your GUI portrays as "deleted".