提交显示未添加文件的更改

Question

I have a branch called branchA. I've been doing some work on it and ran git pull master to update it with all the changes in the master branch. Within branchA, I want to commit two files and they're called py_file1.py and details.sql. So I do the following:

git add py_file1.py
git add details.sql
git commit

I then pushed the commit to my remote branch on github. When I went to checkout the commit on github, I saw both py_file1.py and details.sql, but it was also showing the changes made on py_file2.py that occurred when I pulled from master. If I never added py_file2.py to be tracked, why are those changes appearing on my commit?

Answer 1

py_file2.py was indeed tracked, in the master branch. Therefore when you merged master into branchA , it became tracked in branchA as well.

That being said, are you saying that it was showing py_file2.py as changed in the same commit as as when you added py_file1.py and details.sql ? If that was the case, then you probably pulled, got some conflicts, resolved them, but did not commit before you added those two files. In general, you don't want to do that; always commit your merge first before doing any non-merge changes.