git pull request not updating diff in new file

Question

I have been working on my local repo on a file. I made changes to it. Committed to my local and made a pull request to origin/master.

Before it was merged into the origin. I found out that one particular file was fine the way it was before. ie no changes were required.

The next thing I did was to git checkout -- [filepath] to the original copy.

I then added and committed (nothing really to commit) and pushed it upstream.

When I went to check the differences it still says that I have made changes to the file when I expected there to be no changes.

Can someone point out where I went wrong?

Answer 1

通常，您的“合并”可能会引用您的提交上的文件更改，即使您在之后重新设置（并再次提交）也是如此。