You should be able to see an individual file's history with git log <filename>
. This may help to identify your mystery files.
For conflicts, the source of the conflict should be shown with the conflict markers:
<<<<<<< HEAD:filename
...
=======
...
>>>>>>> abcd123:filename
It may also help to switch from a git pull
workflow to a git fetch
workflow.
fetch
updates your remote branch pointer (e.g. origin/master
) but does not automatically merge your local branch (e.g. master
). You can then use gitk --all
to visually compare the branches, git diff origin/master
to view changes in the terminal, etc.
Once you are satisfied and want to incorporate your upstream changes, all you need to do is merge (e.g. git merge origin/master
from the master
branch). Generally, git pull
is git fetch
followed by git merge
.